Convert pdfium::MakeUnique<> to std::MakeUnique<> in fpdfdoc.
Use C++14 features.
-- also adjust a comment in fpdfapi missed in an earlier CL.
Change-Id: I40bfa7ea02ee5713f0174a84240f8b3cd1bf4bda
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69992
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/parser/cpdf_object_stream.cpp b/core/fpdfapi/parser/cpdf_object_stream.cpp
index 4df3d16..c0728eb 100644
--- a/core/fpdfapi/parser/cpdf_object_stream.cpp
+++ b/core/fpdfapi/parser/cpdf_object_stream.cpp
@@ -55,8 +55,8 @@
const CPDF_Stream* stream) {
if (!IsObjectsStreamObject(stream))
return nullptr;
- // The ctor of CPDF_ObjectStream is protected. Use WrapUnique instead
- // MakeUnique.
+
+ // Protected constructor.
return pdfium::WrapUnique(new CPDF_ObjectStream(stream));
}
diff --git a/core/fpdfdoc/cba_fontmap.cpp b/core/fpdfdoc/cba_fontmap.cpp
index 705b00a..d8c2f9b 100644
--- a/core/fpdfdoc/cba_fontmap.cpp
+++ b/core/fpdfdoc/cba_fontmap.cpp
@@ -28,7 +28,6 @@
#include "core/fxge/cfx_fontmgr.h"
#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/cfx_substfont.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -55,7 +54,7 @@
if (!pDoc)
return nullptr;
- auto pFXFont = pdfium::MakeUnique<CFX_Font>();
+ auto pFXFont = std::make_unique<CFX_Font>();
pFXFont->LoadSubst(sFontFaceName, true, 0, 0, 0,
FX_GetCodePageFromCharset(nCharset), false);
@@ -380,7 +379,7 @@
int32_t CBA_FontMap::AddFontData(const RetainPtr<CPDF_Font>& pFont,
const ByteString& sFontAlias,
int32_t nCharset) {
- auto pNewData = pdfium::MakeUnique<Data>();
+ auto pNewData = std::make_unique<Data>();
pNewData->pFont = pFont;
pNewData->sFontName = sFontAlias;
pNewData->nCharset = nCharset;
@@ -432,7 +431,7 @@
if (sNew.IsEmpty())
return ByteString();
- auto pNewData = pdfium::MakeUnique<Native>();
+ auto pNewData = std::make_unique<Native>();
pNewData->nCharset = nCharset;
pNewData->sFontName = sNew;
m_NativeFont.push_back(std::move(pNewData));
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index f474074..db78b34 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -25,7 +25,6 @@
#include "core/fxge/cfx_graphstatedata.h"
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -198,7 +197,7 @@
if (it != m_APMap.end())
return it->second.get();
- auto pNewForm = pdfium::MakeUnique<CPDF_Form>(
+ auto pNewForm = std::make_unique<CPDF_Form>(
m_pDocument.Get(), pPage->m_pResources.Get(), pStream);
pNewForm->ParseContent();
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index 37208e3..64ecffb 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -29,7 +29,6 @@
#include "core/fpdfdoc/cpdf_interactiveform.h"
#include "core/fpdfdoc/cpvt_generateap.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -117,7 +116,7 @@
pAnnotDict->SetNewFor<CPDF_Number>(pdfium::annotation::kF, 0);
auto pPopupAnnot =
- pdfium::MakeUnique<CPDF_Annot>(std::move(pAnnotDict), pDocument);
+ std::make_unique<CPDF_Annot>(std::move(pAnnotDict), pDocument);
pAnnot->SetPopupAnnot(pPopupAnnot.get());
return pPopupAnnot;
}
@@ -193,7 +192,7 @@
}
pAnnots->ConvertToIndirectObjectAt(i, m_pDocument.Get());
m_AnnotList.push_back(
- pdfium::MakeUnique<CPDF_Annot>(pDict, m_pDocument.Get()));
+ std::make_unique<CPDF_Annot>(pDict, m_pDocument.Get()));
if (bRegenerateAP && subtype == "Widget" &&
CPDF_InteractiveForm::IsUpdateAPEnabled() &&
!pDict->GetDictFor(pdfium::annotation::kAP)) {
diff --git a/core/fpdfdoc/cpdf_dest_unittest.cpp b/core/fpdfdoc/cpdf_dest_unittest.cpp
index 752a681..0157eaa 100644
--- a/core/fpdfdoc/cpdf_dest_unittest.cpp
+++ b/core/fpdfdoc/cpdf_dest_unittest.cpp
@@ -4,12 +4,13 @@
#include "core/fpdfdoc/cpdf_dest.h"
+#include <memory>
+
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_name.h"
#include "core/fpdfapi/parser/cpdf_null.h"
#include "core/fpdfapi/parser/cpdf_number.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
TEST(cpdf_dest, GetXYZ) {
bool hasX;
@@ -25,18 +26,18 @@
array->AppendNew<CPDF_Name>("XYZ");
array->AppendNew<CPDF_Number>(4); // X
{
- auto dest = pdfium::MakeUnique<CPDF_Dest>(nullptr);
+ auto dest = std::make_unique<CPDF_Dest>(nullptr);
EXPECT_FALSE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom));
}
{
// Not enough entries.
- auto dest = pdfium::MakeUnique<CPDF_Dest>(array.Get());
+ auto dest = std::make_unique<CPDF_Dest>(array.Get());
EXPECT_FALSE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom));
}
array->AppendNew<CPDF_Number>(5); // Y
array->AppendNew<CPDF_Number>(6); // Zoom.
{
- auto dest = pdfium::MakeUnique<CPDF_Dest>(array.Get());
+ auto dest = std::make_unique<CPDF_Dest>(array.Get());
EXPECT_TRUE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom));
EXPECT_TRUE(hasX);
EXPECT_TRUE(hasY);
@@ -48,7 +49,7 @@
// Set zoom to 0.
array->SetNewAt<CPDF_Number>(4, 0);
{
- auto dest = pdfium::MakeUnique<CPDF_Dest>(array.Get());
+ auto dest = std::make_unique<CPDF_Dest>(array.Get());
EXPECT_TRUE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom));
EXPECT_FALSE(hasZoom);
}
@@ -57,7 +58,7 @@
array->SetNewAt<CPDF_Null>(3);
array->SetNewAt<CPDF_Null>(4);
{
- auto dest = pdfium::MakeUnique<CPDF_Dest>(array.Get());
+ auto dest = std::make_unique<CPDF_Dest>(array.Get());
EXPECT_TRUE(dest->GetXYZ(&hasX, &hasY, &hasZoom, &x, &y, &zoom));
EXPECT_FALSE(hasX);
EXPECT_FALSE(hasY);
diff --git a/core/fpdfdoc/cpdf_formfield_unittest.cpp b/core/fpdfdoc/cpdf_formfield_unittest.cpp
index 775adfb..9db7510 100644
--- a/core/fpdfdoc/cpdf_formfield_unittest.cpp
+++ b/core/fpdfdoc/cpdf_formfield_unittest.cpp
@@ -21,7 +21,6 @@
#include "core/fpdfapi/render/cpdf_docrenderdata.h"
#include "core/fpdfdoc/cpdf_interactiveform.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -37,8 +36,8 @@
class CPDF_TestEmptyDocument final : public CPDF_Document {
public:
CPDF_TestEmptyDocument()
- : CPDF_Document(pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>()) {}
+ : CPDF_Document(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>()) {}
};
void TestMultiselectFieldDict(RetainPtr<CPDF_Array> opt_array,
diff --git a/core/fpdfdoc/cpdf_interactiveform.cpp b/core/fpdfdoc/cpdf_interactiveform.cpp
index 3015545..4babd38 100644
--- a/core/fpdfdoc/cpdf_interactiveform.cpp
+++ b/core/fpdfdoc/cpdf_interactiveform.cpp
@@ -29,7 +29,6 @@
#include "core/fxcrt/fx_codepage.h"
#include "core/fxge/cfx_substfont.h"
#include "core/fxge/fx_font.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -483,7 +482,7 @@
if (level > nMaxRecursion)
return nullptr;
- auto pNew = pdfium::MakeUnique<Node>(short_name, pParent->GetLevel() + 1);
+ auto pNew = std::make_unique<Node>(short_name, pParent->GetLevel() + 1);
Node* pChild = pNew.get();
pParent->AddChildNode(std::move(pNew));
return pChild;
@@ -575,7 +574,7 @@
}
CPDF_InteractiveForm::CPDF_InteractiveForm(CPDF_Document* pDocument)
- : m_pDocument(pDocument), m_pFieldTree(pdfium::MakeUnique<CFieldTree>()) {
+ : m_pDocument(pDocument), m_pFieldTree(std::make_unique<CFieldTree>()) {
CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
if (!pRoot)
return;
@@ -918,7 +917,7 @@
}
}
- auto newField = pdfium::MakeUnique<CPDF_FormField>(this, pParent);
+ auto newField = std::make_unique<CPDF_FormField>(this, pParent);
pField = newField.get();
CPDF_Object* pTObj = pDict->GetObjectFor(pdfium::form_fields::kT);
if (ToReference(pTObj)) {
@@ -956,7 +955,7 @@
if (it != m_ControlMap.end())
return it->second.get();
- auto pNew = pdfium::MakeUnique<CPDF_FormControl>(pField, pWidgetDict);
+ auto pNew = std::make_unique<CPDF_FormControl>(pField, pWidgetDict);
CPDF_FormControl* pControl = pNew.get();
m_ControlMap[pWidgetDict] = std::move(pNew);
m_ControlLists[pField].emplace_back(pControl);
diff --git a/core/fpdfdoc/cpdf_structtree.cpp b/core/fpdfdoc/cpdf_structtree.cpp
index 4976d43..d875b57 100644
--- a/core/fpdfdoc/cpdf_structtree.cpp
+++ b/core/fpdfdoc/cpdf_structtree.cpp
@@ -13,7 +13,6 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfdoc/cpdf_numbertree.h"
#include "core/fpdfdoc/cpdf_structelement.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -32,7 +31,7 @@
if (!IsTagged(pDoc))
return nullptr;
- auto pTree = pdfium::MakeUnique<CPDF_StructTree>(pDoc);
+ auto pTree = std::make_unique<CPDF_StructTree>(pDoc);
pTree->LoadPageTree(pPageDict);
return pTree;
}
diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp
index d7d2265..0d4d1fa 100644
--- a/core/fpdfdoc/cpdf_variabletext.cpp
+++ b/core/fpdfdoc/cpdf_variabletext.cpp
@@ -17,7 +17,6 @@
#include "core/fpdfdoc/ipvt_fontmap.h"
#include "core/fxcrt/fx_codepage.h"
#include "third_party/base/compiler_specific.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -544,7 +543,7 @@
int32_t nSecIndex = pdfium::clamp(
place.nSecIndex, 0, pdfium::CollectionSize<int32_t>(m_SectionArray));
- auto pSection = pdfium::MakeUnique<CSection>(this);
+ auto pSection = std::make_unique<CSection>(this);
pSection->m_Rect = CPVT_FloatRect();
pSection->SecPlace.nSecIndex = nSecIndex;
m_SectionArray.insert(m_SectionArray.begin() + nSecIndex,
@@ -898,7 +897,7 @@
CPDF_VariableText::Iterator* CPDF_VariableText::GetIterator() {
if (!m_pVTIterator)
- m_pVTIterator = pdfium::MakeUnique<CPDF_VariableText::Iterator>(this);
+ m_pVTIterator = std::make_unique<CPDF_VariableText::Iterator>(this);
return m_pVTIterator.get();
}
diff --git a/core/fpdfdoc/csection.cpp b/core/fpdfdoc/csection.cpp
index ad962be..9349bd5 100644
--- a/core/fpdfdoc/csection.cpp
+++ b/core/fpdfdoc/csection.cpp
@@ -11,7 +11,6 @@
#include "core/fpdfdoc/cline.h"
#include "core/fpdfdoc/cpdf_variabletext.h"
#include "core/fpdfdoc/cpvt_wordinfo.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
CSection::CSection(CPDF_VariableText* pVT) : m_pVT(pVT) {
@@ -33,12 +32,12 @@
int32_t nWordIndex = pdfium::clamp(
place.nWordIndex, 0, pdfium::CollectionSize<int32_t>(m_WordArray));
m_WordArray.insert(m_WordArray.begin() + nWordIndex,
- pdfium::MakeUnique<CPVT_WordInfo>(wordinfo));
+ std::make_unique<CPVT_WordInfo>(wordinfo));
return place;
}
CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo& lineinfo) {
- m_LineArray.push_back(pdfium::MakeUnique<CLine>(lineinfo));
+ m_LineArray.push_back(std::make_unique<CLine>(lineinfo));
return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.size() - 1, -1);
}
