diff options
| author | tsepez <tsepez@chromium.org> | 2016-12-14 05:57:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-12-14 05:57:10 -0800 |
| commit | a9caab94c1f16929e5acf2676117224617d80f53 (patch) | |
| tree | d71ff9a82fae6e6080deb76375f43056127b3ee2 /fpdfsdk | |
| parent | 992ecf7c189e5cabf43e5ad862511cf63d030966 (diff) | |
| download | pdfium-a9caab94c1f16929e5acf2676117224617d80f53.tar.xz | |
Avoid the ptr.reset(new XXX()) anti-pattern
Be suspicious of |new|. This removes some of the
easy cases.
Review-Url: https://codereview.chromium.org/2571913002
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfdoc.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/fpdfdoc_unittest.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index ce4fc34982..82b898aa85 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -17,6 +17,7 @@ #include "core/fpdfdoc/cpdf_dest.h" #include "core/fpdfdoc/cpdf_pagelabel.h" #include "fpdfsdk/fsdk_define.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" namespace { @@ -55,7 +56,7 @@ CPDF_LinkList* GetLinkList(CPDF_Page* page) { CPDF_Document* pDoc = page->m_pDocument; std::unique_ptr<CPDF_LinkList>* pHolder = pDoc->LinksContext(); if (!pHolder->get()) - pHolder->reset(new CPDF_LinkList); + *pHolder = pdfium::MakeUnique<CPDF_LinkList>(); return pHolder->get(); } diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index 664ce39381..c63d6c2e77 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -65,8 +65,9 @@ class PDFDocTest : public testing::Test { m_pDoc = pdfium::MakeUnique<CPDF_TestPdfDocument>(); m_pIndirectObjs = m_pDoc->GetHolder(); + // Setup the root directory. - m_pRootObj.reset(new CPDF_Dictionary()); + m_pRootObj = pdfium::MakeUnique<CPDF_Dictionary>(); m_pDoc->SetRoot(m_pRootObj.get()); } |