Convert pdfium::MakeUnique<> to std::make_unique<> in fpdfapi
Use C++14 features.
-- ensure <memory> included in .cpp or corresponding .h file
-- remove ptr_util.h include unless WrapUnique() (0 cases).
-- nits: fix includes in tests, default one ctor/dtor.
Change-Id: I8df1078174d7a995df98348b0cd30da46a93d82e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69991
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/edit/cpdf_creator.cpp b/core/fpdfapi/edit/cpdf_creator.cpp
index 8e091f0..0243c04 100644
--- a/core/fpdfapi/edit/cpdf_creator.cpp
+++ b/core/fpdfapi/edit/cpdf_creator.cpp
@@ -24,7 +24,6 @@
#include "core/fxcrt/fx_memory_wrappers.h"
#include "core/fxcrt/fx_random.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -147,7 +146,7 @@
m_pEncryptDict(m_pParser ? m_pParser->GetEncryptDict() : nullptr),
m_pSecurityHandler(m_pParser ? m_pParser->GetSecurityHandler() : nullptr),
m_dwLastObjNum(m_pDocument->GetLastObjNum()),
- m_Archive(pdfium::MakeUnique<CFX_FileBufferArchive>(archive)) {}
+ m_Archive(std::make_unique<CFX_FileBufferArchive>(archive)) {}
CPDF_Creator::~CPDF_Creator() {}
@@ -157,7 +156,7 @@
std::unique_ptr<CPDF_Encryptor> encryptor;
if (GetCryptoHandler() && pObj != m_pEncryptDict)
- encryptor = pdfium::MakeUnique<CPDF_Encryptor>(GetCryptoHandler(), objnum);
+ encryptor = std::make_unique<CPDF_Encryptor>(GetCryptoHandler(), objnum);
if (!pObj->WriteTo(m_Archive.get(), encryptor.get()))
return false;
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index c972b74..2dda2b6 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -34,7 +34,6 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/span.h"
#include "third_party/base/stl_util.h"
@@ -93,12 +92,12 @@
std::map<int32_t, std::unique_ptr<std::ostringstream>> streams;
std::set<int32_t> empty_streams;
std::unique_ptr<const CPDF_ContentMarks> empty_content_marks =
- pdfium::MakeUnique<CPDF_ContentMarks>();
+ std::make_unique<CPDF_ContentMarks>();
std::map<int32_t, const CPDF_ContentMarks*> current_content_marks;
for (int32_t dirty_stream : all_dirty_streams) {
std::unique_ptr<std::ostringstream> buf =
- pdfium::MakeUnique<std::ostringstream>();
+ std::make_unique<std::ostringstream>();
// Set the default graphic state values
*buf << "q\n";
@@ -207,7 +206,7 @@
bool CPDF_PageContentGenerator::ProcessPageObjects(std::ostringstream* buf) {
bool bDirty = false;
std::unique_ptr<const CPDF_ContentMarks> empty_content_marks =
- pdfium::MakeUnique<CPDF_ContentMarks>();
+ std::make_unique<CPDF_ContentMarks>();
const CPDF_ContentMarks* content_marks = empty_content_marks.get();
for (auto& pPageObj : m_pageObjects) {
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
index 1ae7c49..81ee6e8 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
@@ -25,7 +25,6 @@
#include "core/fxcrt/fx_memory_wrappers.h"
#include "core/fxge/render_defines.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
class CPDF_PageContentGeneratorTest : public testing::Test {
protected:
@@ -52,7 +51,7 @@
};
TEST_F(CPDF_PageContentGeneratorTest, ProcessRect) {
- auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
+ auto pPathObj = std::make_unique<CPDF_PathObject>();
pPathObj->set_stroke(true);
pPathObj->set_filltype(FXFILL_ALTERNATE);
pPathObj->path().AppendRect(10, 5, 13, 30);
@@ -65,7 +64,7 @@
TestProcessPath(&generator, &buf, pPathObj.get());
EXPECT_EQ("q 1 0 0 1 0 0 cm 10 5 3 25 re B* Q\n", ByteString(buf));
- pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
+ pPathObj = std::make_unique<CPDF_PathObject>();
pPathObj->path().AppendPoint(CFX_PointF(0, 0), FXPT_TYPE::MoveTo);
pPathObj->path().AppendPoint(CFX_PointF(5.2f, 0), FXPT_TYPE::LineTo);
pPathObj->path().AppendPoint(CFX_PointF(5.2f, 3.78f), FXPT_TYPE::LineTo);
@@ -79,7 +78,7 @@
static const std::vector<float> rgb = {0.000000000000000000001f, 0.7f, 0.35f};
RetainPtr<CPDF_ColorSpace> pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB);
{
- auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
+ auto pPathObj = std::make_unique<CPDF_PathObject>();
pPathObj->set_filltype(FXFILL_WINDING);
// Test code in ProcessPath that generates re operator
@@ -107,7 +106,7 @@
{
// Test code in ProcessPath that handles bezier operator
- auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
+ auto pPathObj = std::make_unique<CPDF_PathObject>();
pPathObj->m_ColorState.SetFillColor(pCS, rgb);
pPathObj->m_ColorState.SetStrokeColor(pCS, rgb);
pPathObj->m_GraphState.SetLineWidth(2.000000000000000000001);
@@ -142,7 +141,7 @@
}
TEST_F(CPDF_PageContentGeneratorTest, ProcessPath) {
- auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
+ auto pPathObj = std::make_unique<CPDF_PathObject>();
pPathObj->set_filltype(FXFILL_WINDING);
pPathObj->path().AppendPoint(CFX_PointF(3.102f, 4.67f), FXPT_TYPE::MoveTo);
pPathObj->path().AppendPoint(CFX_PointF(5.45f, 0.29f), FXPT_TYPE::LineTo);
@@ -171,7 +170,7 @@
}
TEST_F(CPDF_PageContentGeneratorTest, ProcessGraphics) {
- auto pPathObj = pdfium::MakeUnique<CPDF_PathObject>();
+ auto pPathObj = std::make_unique<CPDF_PathObject>();
pPathObj->set_stroke(true);
pPathObj->set_filltype(FXFILL_WINDING);
pPathObj->path().AppendPoint(CFX_PointF(1, 2), FXPT_TYPE::MoveTo);
@@ -187,9 +186,9 @@
pPathObj->m_GeneralState.SetFillAlpha(0.5f);
pPathObj->m_GeneralState.SetStrokeAlpha(0.8f);
- auto pDoc = pdfium::MakeUnique<CPDF_Document>(
- pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ auto pDoc =
+ std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
pDoc->CreateNewDoc();
CPDF_Dictionary* pPageDict = pDoc->CreateNewPage(0);
@@ -230,15 +229,15 @@
TEST_F(CPDF_PageContentGeneratorTest, ProcessStandardText) {
// Checking font whose font dictionary is not yet indirect object.
- auto pDoc = pdfium::MakeUnique<CPDF_Document>(
- pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ auto pDoc =
+ std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
pDoc->CreateNewDoc();
CPDF_Dictionary* pPageDict = pDoc->CreateNewPage(0);
auto pTestPage = pdfium::MakeRetain<CPDF_Page>(pDoc.get(), pPageDict);
CPDF_PageContentGenerator generator(pTestPage.Get());
- auto pTextObj = pdfium::MakeUnique<CPDF_TextObject>();
+ auto pTextObj = std::make_unique<CPDF_TextObject>();
RetainPtr<CPDF_Font> pFont =
CPDF_Font::GetStockFont(pDoc.get(), "Times-Roman");
pTextObj->m_TextState.SetFont(pFont);
@@ -298,9 +297,9 @@
TEST_F(CPDF_PageContentGeneratorTest, ProcessText) {
// Checking font whose font dictionary is already an indirect object.
- auto pDoc = pdfium::MakeUnique<CPDF_Document>(
- pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ auto pDoc =
+ std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
pDoc->CreateNewDoc();
CPDF_Dictionary* pPageDict = pDoc->CreateNewPage(0);
@@ -310,7 +309,7 @@
std::ostringstream buf;
{
// Set the text object font and text
- auto pTextObj = pdfium::MakeUnique<CPDF_TextObject>();
+ auto pTextObj = std::make_unique<CPDF_TextObject>();
CPDF_Dictionary* pDict = pDoc->NewIndirect<CPDF_Dictionary>();
pDict->SetNewFor<CPDF_Name>("Type", "Font");
pDict->SetNewFor<CPDF_Name>("Subtype", "TrueType");
@@ -364,16 +363,16 @@
}
TEST_F(CPDF_PageContentGeneratorTest, ProcessEmptyForm) {
- auto pDoc = pdfium::MakeUnique<CPDF_Document>(
- pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ auto pDoc =
+ std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
pDoc->CreateNewDoc();
auto pDict = pdfium::MakeRetain<CPDF_Dictionary>();
auto pStream = pdfium::MakeRetain<CPDF_Stream>(nullptr, 0, std::move(pDict));
// Create an empty form.
auto pTestForm =
- pdfium::MakeUnique<CPDF_Form>(pDoc.get(), nullptr, pStream.Get());
+ std::make_unique<CPDF_Form>(pDoc.get(), nullptr, pStream.Get());
pTestForm->ParseContent();
ASSERT_EQ(CPDF_PageObjectHolder::ParseState::kParsed,
pTestForm->GetParseState());
@@ -386,9 +385,9 @@
}
TEST_F(CPDF_PageContentGeneratorTest, ProcessFormWithPath) {
- auto pDoc = pdfium::MakeUnique<CPDF_Document>(
- pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ auto pDoc =
+ std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
pDoc->CreateNewDoc();
auto pDict = pdfium::MakeRetain<CPDF_Dictionary>();
const char content[] =
@@ -402,7 +401,7 @@
// Create a form with a non-empty stream.
auto pTestForm =
- pdfium::MakeUnique<CPDF_Form>(pDoc.get(), nullptr, pStream.Get());
+ std::make_unique<CPDF_Form>(pDoc.get(), nullptr, pStream.Get());
pTestForm->ParseContent();
ASSERT_EQ(CPDF_PageObjectHolder::ParseState::kParsed,
pTestForm->GetParseState());
diff --git a/core/fpdfapi/font/cfx_cttgsubtable.cpp b/core/fpdfapi/font/cfx_cttgsubtable.cpp
index 60223e4..305ece5 100644
--- a/core/fpdfapi/font/cfx_cttgsubtable.cpp
+++ b/core/fpdfapi/font/cfx_cttgsubtable.cpp
@@ -9,7 +9,6 @@
#include <utility>
#include "core/fxge/cfx_fontmapper.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -248,12 +247,12 @@
FT_Bytes sp = raw;
uint16_t format = GetUInt16(sp);
if (format == 1) {
- auto rec = pdfium::MakeUnique<TCoverageFormat1>();
+ auto rec = std::make_unique<TCoverageFormat1>();
ParseCoverageFormat1(raw, rec.get());
return std::move(rec);
}
if (format == 2) {
- auto rec = pdfium::MakeUnique<TCoverageFormat2>();
+ auto rec = std::make_unique<TCoverageFormat2>();
ParseCoverageFormat2(raw, rec.get());
return std::move(rec);
}
@@ -288,11 +287,11 @@
uint16_t Format = GetUInt16(sp);
switch (Format) {
case 1:
- *rec = pdfium::MakeUnique<TSubTable1>();
+ *rec = std::make_unique<TSubTable1>();
ParseSingleSubstFormat1(raw, static_cast<TSubTable1*>(rec->get()));
break;
case 2:
- *rec = pdfium::MakeUnique<TSubTable2>();
+ *rec = std::make_unique<TSubTable2>();
ParseSingleSubstFormat2(raw, static_cast<TSubTable2*>(rec->get()));
break;
}
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index 306655b..51112c5 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -23,7 +23,6 @@
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/fx_font.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/span.h"
#include "third_party/base/stl_util.h"
@@ -576,7 +575,7 @@
if (error || !m_Font.GetSubData())
return index;
- m_pTTGSUBTable = pdfium::MakeUnique<CFX_CTTGSUBTable>(m_Font.GetSubData());
+ m_pTTGSUBTable = std::make_unique<CFX_CTTGSUBTable>(m_Font.GetSubData());
return GetVerticalGlyph(index, pVertGlyph);
}
diff --git a/core/fpdfapi/font/cpdf_cidfont_unittest.cpp b/core/fpdfapi/font/cpdf_cidfont_unittest.cpp
index 24f3e48..cafd458 100644
--- a/core/fpdfapi/font/cpdf_cidfont_unittest.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont_unittest.cpp
@@ -14,7 +14,6 @@
#include "core/fpdfapi/parser/cpdf_name.h"
#include "core/fpdfapi/render/cpdf_docrenderdata.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
class CPDF_CIDFontTest : public testing::Test {
protected:
@@ -23,8 +22,8 @@
};
TEST_F(CPDF_CIDFontTest, BUG_920636) {
- CPDF_Document doc(pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ CPDF_Document doc(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
auto font_dict = pdfium::MakeRetain<CPDF_Dictionary>();
font_dict->SetNewFor<CPDF_Name>("Encoding", "Identity−H");
diff --git a/core/fpdfapi/font/cpdf_cmapmanager.cpp b/core/fpdfapi/font/cpdf_cmapmanager.cpp
index 726b648..cefa594 100644
--- a/core/fpdfapi/font/cpdf_cmapmanager.cpp
+++ b/core/fpdfapi/font/cpdf_cmapmanager.cpp
@@ -10,7 +10,6 @@
#include "core/fpdfapi/font/cpdf_cid2unicodemap.h"
#include "core/fpdfapi/font/cpdf_cmap.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -41,8 +40,7 @@
CPDF_CID2UnicodeMap* CPDF_CMapManager::GetCID2UnicodeMap(CIDSet charset) {
if (!m_CID2UnicodeMaps[charset]) {
- m_CID2UnicodeMaps[charset] =
- pdfium::MakeUnique<CPDF_CID2UnicodeMap>(charset);
+ m_CID2UnicodeMaps[charset] = std::make_unique<CPDF_CID2UnicodeMap>(charset);
}
return m_CID2UnicodeMaps[charset].get();
}
diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index df7ef69..cbf5fdf 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -31,7 +31,6 @@
#include "core/fxge/fx_font.h"
#include "core/fxge/fx_freetype.h"
#include "third_party/base/logging.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -274,7 +273,7 @@
if (!pStream)
return;
- m_pToUnicodeMap = pdfium::MakeUnique<CPDF_ToUnicodeMap>(pStream);
+ m_pToUnicodeMap = std::make_unique<CPDF_ToUnicodeMap>(pStream);
}
uint32_t CPDF_Font::GetStringWidth(ByteStringView pString) {
@@ -380,7 +379,7 @@
uint32_t CPDF_Font::FallbackFontFromCharcode(uint32_t charcode) {
if (m_FontFallbacks.empty()) {
- m_FontFallbacks.push_back(pdfium::MakeUnique<CFX_Font>());
+ m_FontFallbacks.push_back(std::make_unique<CFX_Font>());
FX_SAFE_INT32 safeWeight = m_StemV;
safeWeight *= 5;
m_FontFallbacks[0]->LoadSubst("Arial", IsTrueTypeFont(), m_Flags,
diff --git a/core/fpdfapi/font/cpdf_fontglobals.cpp b/core/fpdfapi/font/cpdf_fontglobals.cpp
index e44c188..7dcd26b 100644
--- a/core/fpdfapi/font/cpdf_fontglobals.cpp
+++ b/core/fpdfapi/font/cpdf_fontglobals.cpp
@@ -12,7 +12,6 @@
#include "core/fpdfapi/cmaps/Korea1/cmaps_korea1.h"
#include "core/fpdfapi/font/cfx_stockfontarray.h"
#include "core/fpdfapi/parser/cpdf_document.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -68,7 +67,7 @@
CFX_FontMapper::StandardFont index,
const RetainPtr<CPDF_Font>& pFont) {
if (!pdfium::Contains(m_StockMap, pDoc))
- m_StockMap[pDoc] = pdfium::MakeUnique<CFX_StockFontArray>();
+ m_StockMap[pDoc] = std::make_unique<CFX_StockFontArray>();
m_StockMap[pDoc]->SetFont(index, pFont);
}
diff --git a/core/fpdfapi/font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
index 2cbf95c..a49f177 100644
--- a/core/fpdfapi/font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -16,7 +16,6 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fxcrt/autorestorer.h"
#include "core/fxcrt/fx_system.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -125,7 +124,7 @@
m_pFontResources ? m_pFontResources.Get() : m_pPageResources.Get(),
pStream);
- auto pNewChar = pdfium::MakeUnique<CPDF_Type3Char>();
+ auto pNewChar = std::make_unique<CPDF_Type3Char>();
// This can trigger recursion into this method. The content of |m_CacheMap|
// can change as a result. Thus after it returns, check the cache again for
diff --git a/core/fpdfapi/page/cpdf_annotcontext.cpp b/core/fpdfapi/page/cpdf_annotcontext.cpp
index ec3a7ff..b11ff55 100644
--- a/core/fpdfapi/page/cpdf_annotcontext.cpp
+++ b/core/fpdfapi/page/cpdf_annotcontext.cpp
@@ -10,7 +10,6 @@
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
-#include "third_party/base/ptr_util.h"
CPDF_AnnotContext::CPDF_AnnotContext(CPDF_Dictionary* pAnnotDict,
IPDF_Page* pPage)
@@ -30,7 +29,7 @@
// appearance stream already takes matrix into account.
pStream->GetDict()->SetMatrixFor("Matrix", CFX_Matrix());
- m_pAnnotForm = pdfium::MakeUnique<CPDF_Form>(
+ m_pAnnotForm = std::make_unique<CPDF_Form>(
m_pPage->GetDocument(), m_pPage->AsPDFPage()->m_pResources.Get(),
pStream);
m_pAnnotForm->ParseContent();
diff --git a/core/fpdfapi/page/cpdf_color.cpp b/core/fpdfapi/page/cpdf_color.cpp
index 134cb5c..6c739b7 100644
--- a/core/fpdfapi/page/cpdf_color.cpp
+++ b/core/fpdfapi/page/cpdf_color.cpp
@@ -8,7 +8,6 @@
#include "core/fpdfapi/page/cpdf_patterncs.h"
#include "core/fxcrt/fx_system.h"
-#include "third_party/base/ptr_util.h"
CPDF_Color::CPDF_Color() = default;
@@ -30,7 +29,7 @@
m_pCS = pCS;
if (IsPatternInternal()) {
m_Buffer.clear();
- m_pValue = pdfium::MakeUnique<PatternValue>();
+ m_pValue = std::make_unique<PatternValue>();
} else {
m_Buffer = pCS->CreateBufAndSetDefaultColor();
m_pValue.reset();
@@ -60,8 +59,8 @@
return *this;
m_Buffer = that.m_Buffer;
- m_pValue = that.m_pValue ? pdfium::MakeUnique<PatternValue>(*that.m_pValue)
- : nullptr;
+ m_pValue =
+ that.m_pValue ? std::make_unique<PatternValue>(*that.m_pValue) : nullptr;
m_pCS = that.m_pCS;
return *this;
}
diff --git a/core/fpdfapi/page/cpdf_contentmarks.cpp b/core/fpdfapi/page/cpdf_contentmarks.cpp
index 9884152..dc41a3d 100644
--- a/core/fpdfapi/page/cpdf_contentmarks.cpp
+++ b/core/fpdfapi/page/cpdf_contentmarks.cpp
@@ -10,14 +10,13 @@
#include <utility>
#include "core/fpdfapi/parser/cpdf_dictionary.h"
-#include "third_party/base/ptr_util.h"
-CPDF_ContentMarks::CPDF_ContentMarks() {}
+CPDF_ContentMarks::CPDF_ContentMarks() = default;
-CPDF_ContentMarks::~CPDF_ContentMarks() {}
+CPDF_ContentMarks::~CPDF_ContentMarks() = default;
std::unique_ptr<CPDF_ContentMarks> CPDF_ContentMarks::Clone() {
- auto result = pdfium::MakeUnique<CPDF_ContentMarks>();
+ auto result = std::make_unique<CPDF_ContentMarks>();
if (m_pMarkData)
result->m_pMarkData = pdfium::MakeRetain<MarkData>(*m_pMarkData);
return result;
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp
index 5b3efe1..ba320f9 100644
--- a/core/fpdfapi/page/cpdf_contentparser.cpp
+++ b/core/fpdfapi/page/cpdf_contentparser.cpp
@@ -20,7 +20,6 @@
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/pauseindicator_iface.h"
#include "core/fxge/render_defines.h"
-#include "third_party/base/ptr_util.h"
CPDF_ContentParser::CPDF_ContentParser(CPDF_Page* pPage)
: m_CurrentStage(Stage::kGetContent), m_pObjectHolder(pPage) {
@@ -80,7 +79,7 @@
}
CPDF_Dictionary* pResources = pForm->GetDict()->GetDictFor("Resources");
- m_pParser = pdfium::MakeUnique<CPDF_StreamContentParser>(
+ m_pParser = std::make_unique<CPDF_StreamContentParser>(
pForm->GetDocument(), pForm->m_pPageResources.Get(),
pForm->m_pResources.Get(), pParentMatrix, pForm, pResources, form_bbox,
pGraphicStates, pParsedSet);
@@ -183,8 +182,8 @@
CPDF_ContentParser::Stage CPDF_ContentParser::Parse() {
if (!m_pParser) {
- m_pParsedSet = pdfium::MakeUnique<std::set<const uint8_t*>>();
- m_pParser = pdfium::MakeUnique<CPDF_StreamContentParser>(
+ m_pParsedSet = std::make_unique<std::set<const uint8_t*>>();
+ m_pParser = std::make_unique<CPDF_StreamContentParser>(
m_pObjectHolder->GetDocument(), m_pObjectHolder->m_pPageResources.Get(),
nullptr, nullptr, m_pObjectHolder.Get(),
m_pObjectHolder->m_pResources.Get(), m_pObjectHolder->GetBBox(),
diff --git a/core/fpdfapi/page/cpdf_dib.cpp b/core/fpdfapi/page/cpdf_dib.cpp
index a72ac5f..7dc2324 100644
--- a/core/fpdfapi/page/cpdf_dib.cpp
+++ b/core/fpdfapi/page/cpdf_dib.cpp
@@ -33,7 +33,6 @@
#include "core/fxcrt/cfx_fixedbufgrow.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxge/dib/cfx_dibitmap.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -324,7 +323,7 @@
FXCODEC_STATUS iDecodeStatus;
if (!m_pJbig2Context) {
- m_pJbig2Context = pdfium::MakeUnique<Jbig2Context>();
+ m_pJbig2Context = std::make_unique<Jbig2Context>();
if (m_pStreamAcc->GetImageParam()) {
const CPDF_Stream* pGlobals =
m_pStreamAcc->GetImageParam()->GetStreamFor("JBIG2Globals");
diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp
index 2ccb676..a242e35 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata.cpp
@@ -440,7 +440,7 @@
CPDF_Document* pDocument,
CPDF_Dictionary* pPageResources,
CPDF_Stream* pFormStream) {
- return pdfium::MakeUnique<CPDF_Form>(pDocument, pPageResources, pFormStream);
+ return std::make_unique<CPDF_Form>(pDocument, pPageResources, pFormStream);
}
RetainPtr<CPDF_Font> CPDF_DocPageData::AddStandardFont(
@@ -466,7 +466,7 @@
CPDF_Dictionary* pBaseDict = GetDocument()->NewIndirect<CPDF_Dictionary>();
pBaseDict->SetNewFor<CPDF_Name>("Type", "Font");
- auto pEncoding = pdfium::MakeUnique<CFX_UnicodeEncoding>(pFont.get());
+ auto pEncoding = std::make_unique<CFX_UnicodeEncoding>(pFont.get());
CPDF_Dictionary* pFontDict = pBaseDict;
if (!bCJK) {
auto pWidths = pdfium::MakeRetain<CPDF_Array>();
diff --git a/core/fpdfapi/page/cpdf_form.cpp b/core/fpdfapi/page/cpdf_form.cpp
index ab3296e..866a64b 100644
--- a/core/fpdfapi/page/cpdf_form.cpp
+++ b/core/fpdfapi/page/cpdf_form.cpp
@@ -15,7 +15,6 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fxge/dib/cfx_dibitmap.h"
-#include "third_party/base/ptr_util.h"
// static
CPDF_Dictionary* CPDF_Form::ChooseResourcesDict(
@@ -73,10 +72,10 @@
if (GetParseState() == ParseState::kNotParsed) {
if (!pParsedSet) {
if (!m_ParsedSet)
- m_ParsedSet = pdfium::MakeUnique<std::set<const uint8_t*>>();
+ m_ParsedSet = std::make_unique<std::set<const uint8_t*>>();
pParsedSet = m_ParsedSet.get();
}
- StartParse(pdfium::MakeUnique<CPDF_ContentParser>(
+ StartParse(std::make_unique<CPDF_ContentParser>(
this, pGraphicStates, pParentMatrix, pType3Char, pParsedSet));
}
diff --git a/core/fpdfapi/page/cpdf_function.cpp b/core/fpdfapi/page/cpdf_function.cpp
index 6668673..ae0b8fb 100644
--- a/core/fpdfapi/page/cpdf_function.cpp
+++ b/core/fpdfapi/page/cpdf_function.cpp
@@ -17,7 +17,6 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -63,13 +62,13 @@
std::unique_ptr<CPDF_Function> pFunc;
Type type = IntegerToFunctionType(iType);
if (type == Type::kType0Sampled)
- pFunc = pdfium::MakeUnique<CPDF_SampledFunc>();
+ pFunc = std::make_unique<CPDF_SampledFunc>();
else if (type == Type::kType2ExponentialInterpolation)
- pFunc = pdfium::MakeUnique<CPDF_ExpIntFunc>();
+ pFunc = std::make_unique<CPDF_ExpIntFunc>();
else if (type == Type::kType3Stitching)
- pFunc = pdfium::MakeUnique<CPDF_StitchFunc>();
+ pFunc = std::make_unique<CPDF_StitchFunc>();
else if (type == Type::kType4PostScript)
- pFunc = pdfium::MakeUnique<CPDF_PSFunc>();
+ pFunc = std::make_unique<CPDF_PSFunc>();
if (!pFunc || !pFunc->Init(pFuncObj, pVisited))
return nullptr;
diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp
index 06b2329..c7ff446 100644
--- a/core/fpdfapi/page/cpdf_meshstream.cpp
+++ b/core/fpdfapi/page/cpdf_meshstream.cpp
@@ -12,7 +12,6 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/span.h"
namespace {
@@ -122,7 +121,7 @@
bool CPDF_MeshStream::Load() {
m_pStream->LoadAllDataFiltered();
- m_BitStream = pdfium::MakeUnique<CFX_BitStream>(m_pStream->GetSpan());
+ m_BitStream = std::make_unique<CFX_BitStream>(m_pStream->GetSpan());
const CPDF_Dictionary* pDict = m_pShadingStream->GetDict();
m_nCoordBits = pDict->GetIntegerFor("BitsPerCoordinate");
m_nComponentBits = pDict->GetIntegerFor("BitsPerComponent");
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp
index 5946d9b..89c03a8 100644
--- a/core/fpdfapi/page/cpdf_page.cpp
+++ b/core/fpdfapi/page/cpdf_page.cpp
@@ -15,7 +15,6 @@
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_object.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
CPDF_Page::CPDF_Page(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict)
@@ -67,7 +66,7 @@
return;
if (GetParseState() == ParseState::kNotParsed)
- StartParse(pdfium::MakeUnique<CPDF_ContentParser>(this));
+ StartParse(std::make_unique<CPDF_ContentParser>(this));
ASSERT(GetParseState() == ParseState::kParsing);
ContinueParse(nullptr);
diff --git a/core/fpdfapi/page/cpdf_psengine.cpp b/core/fpdfapi/page/cpdf_psengine.cpp
index 98f5c47..abd5a8e 100644
--- a/core/fpdfapi/page/cpdf_psengine.cpp
+++ b/core/fpdfapi/page/cpdf_psengine.cpp
@@ -15,7 +15,6 @@
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/fx_string.h"
#include "third_party/base/logging.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -82,7 +81,7 @@
} // namespace
CPDF_PSOP::CPDF_PSOP()
- : m_op(PSOP_PROC), m_value(0), m_proc(pdfium::MakeUnique<CPDF_PSProc>()) {}
+ : m_op(PSOP_PROC), m_value(0), m_proc(std::make_unique<CPDF_PSProc>()) {}
CPDF_PSOP::CPDF_PSOP(PDF_PSOP op) : m_op(op), m_value(0) {
ASSERT(m_op != PSOP_CONST);
@@ -128,7 +127,7 @@
return true;
if (word == "{") {
- m_Operators.push_back(pdfium::MakeUnique<CPDF_PSOP>());
+ m_Operators.push_back(std::make_unique<CPDF_PSOP>());
if (!m_Operators.back()->GetProc()->Parse(parser, depth + 1))
return false;
continue;
@@ -180,9 +179,9 @@
return name.name < word;
});
if (pFound != std::end(kPsOpNames) && pFound->name == word)
- m_Operators.push_back(pdfium::MakeUnique<CPDF_PSOP>(pFound->op));
+ m_Operators.push_back(std::make_unique<CPDF_PSOP>(pFound->op));
else
- m_Operators.push_back(pdfium::MakeUnique<CPDF_PSOP>(StringToFloat(word)));
+ m_Operators.push_back(std::make_unique<CPDF_PSOP>(StringToFloat(word)));
}
CPDF_PSEngine::CPDF_PSEngine() = default;
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index cf8b35a..5d2e429 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -266,7 +266,7 @@
m_pObjectHolder(pObjHolder),
m_ParsedSet(pParsedSet),
m_BBox(rcBBox),
- m_pCurStates(pdfium::MakeUnique<CPDF_AllStates>()) {
+ m_pCurStates(std::make_unique<CPDF_AllStates>()) {
if (pmtContentToUser)
m_mtContentToUser = *pmtContentToUser;
if (pStates) {
@@ -279,7 +279,7 @@
}
// Add the sentinel.
- m_ContentMarksStack.push(pdfium::MakeUnique<CPDF_ContentMarks>());
+ m_ContentMarksStack.push(std::make_unique<CPDF_ContentMarks>());
}
CPDF_StreamContentParser::~CPDF_StreamContentParser() {
@@ -769,14 +769,14 @@
status.m_GraphState = m_pCurStates->m_GraphState;
status.m_ColorState = m_pCurStates->m_ColorState;
status.m_TextState = m_pCurStates->m_TextState;
- auto form = pdfium::MakeUnique<CPDF_Form>(
+ auto form = std::make_unique<CPDF_Form>(
m_pDocument.Get(), m_pPageResources.Get(), pStream, m_pResources.Get());
form->ParseContent(&status, nullptr, m_ParsedSet.Get());
CFX_Matrix matrix = m_pCurStates->m_CTM * m_mtContentToUser;
- auto pFormObj = pdfium::MakeUnique<CPDF_FormObject>(GetCurrentStreamIndex(),
- std::move(form), matrix);
+ auto pFormObj = std::make_unique<CPDF_FormObject>(GetCurrentStreamIndex(),
+ std::move(form), matrix);
if (!m_pObjectHolder->BackgroundAlphaNeeded() &&
pFormObj->form()->BackgroundAlphaNeeded()) {
m_pObjectHolder->SetBackgroundAlphaNeeded(true);
@@ -791,8 +791,7 @@
if (!pStream)
return nullptr;
- auto pImageObj =
- pdfium::MakeUnique<CPDF_ImageObject>(GetCurrentStreamIndex());
+ auto pImageObj = std::make_unique<CPDF_ImageObject>(GetCurrentStreamIndex());
pImageObj->SetImage(
pdfium::MakeRetain<CPDF_Image>(m_pDocument.Get(), std::move(pStream)));
@@ -800,8 +799,7 @@
}
CPDF_ImageObject* CPDF_StreamContentParser::AddImage(uint32_t streamObjNum) {
- auto pImageObj =
- pdfium::MakeUnique<CPDF_ImageObject>(GetCurrentStreamIndex());
+ auto pImageObj = std::make_unique<CPDF_ImageObject>(GetCurrentStreamIndex());
pImageObj->SetImage(CPDF_DocPageData::FromDocument(m_pDocument.Get())
->GetImage(streamObjNum));
@@ -813,8 +811,7 @@
if (!pImage)
return nullptr;
- auto pImageObj =
- pdfium::MakeUnique<CPDF_ImageObject>(GetCurrentStreamIndex());
+ auto pImageObj = std::make_unique<CPDF_ImageObject>(GetCurrentStreamIndex());
pImageObj->SetImage(CPDF_DocPageData::FromDocument(m_pDocument.Get())
->GetImage(pImage->GetStream()->GetObjNum()));
@@ -974,7 +971,7 @@
}
void CPDF_StreamContentParser::Handle_SaveGraphState() {
- auto pStates = pdfium::MakeUnique<CPDF_AllStates>();
+ auto pStates = std::make_unique<CPDF_AllStates>();
pStates->Copy(*m_pCurStates);
m_StateStack.push_back(std::move(pStates));
}
@@ -1085,8 +1082,8 @@
return;
CFX_Matrix matrix = m_pCurStates->m_CTM * m_mtContentToUser;
- auto pObj = pdfium::MakeUnique<CPDF_ShadingObject>(GetCurrentStreamIndex(),
- pShading, matrix);
+ auto pObj = std::make_unique<CPDF_ShadingObject>(GetCurrentStreamIndex(),
+ pShading, matrix);
SetGraphicStates(pObj.get(), false, false, false);
CFX_FloatRect bbox =
pObj->m_ClipPath.HasRef() ? pObj->m_ClipPath.GetClipBox() : m_BBox;
@@ -1225,7 +1222,7 @@
pFont->IsType3Font() ? TextRenderingMode::MODE_FILL
: m_pCurStates->m_TextState.GetTextMode();
{
- auto pText = pdfium::MakeUnique<CPDF_TextObject>(GetCurrentStreamIndex());
+ auto pText = std::make_unique<CPDF_TextObject>(GetCurrentStreamIndex());
m_pLastTextObject = pText.get();
SetGraphicStates(m_pLastTextObject.Get(), true, true, true);
if (TextRenderingModeIsStrokeMode(text_mode)) {
@@ -1475,8 +1472,7 @@
CFX_Matrix matrix = m_pCurStates->m_CTM * m_mtContentToUser;
if (bStroke || FillType) {
- auto pPathObj =
- pdfium::MakeUnique<CPDF_PathObject>(GetCurrentStreamIndex());
+ auto pPathObj = std::make_unique<CPDF_PathObject>(GetCurrentStreamIndex());
pPathObj->set_stroke(bStroke);
pPathObj->set_filltype(FillType);
pPathObj->path() = path;
diff --git a/core/fpdfapi/page/cpdf_textobject.cpp b/core/fpdfapi/page/cpdf_textobject.cpp
index 077e5ed..d0cc79c 100644
--- a/core/fpdfapi/page/cpdf_textobject.cpp
+++ b/core/fpdfapi/page/cpdf_textobject.cpp
@@ -11,7 +11,6 @@
#include "core/fpdfapi/font/cpdf_cidfont.h"
#include "core/fpdfapi/font/cpdf_font.h"
-#include "third_party/base/ptr_util.h"
#define ISLATINWORD(u) (u != 0x20 && u <= 0x28FF)
@@ -155,7 +154,7 @@
}
std::unique_ptr<CPDF_TextObject> CPDF_TextObject::Clone() const {
- auto obj = pdfium::MakeUnique<CPDF_TextObject>();
+ auto obj = std::make_unique<CPDF_TextObject>();
obj->CopyData(this);
obj->m_CharCodes = m_CharCodes;
obj->m_CharPos = m_CharPos;
diff --git a/core/fpdfapi/page/cpdf_tilingpattern.cpp b/core/fpdfapi/page/cpdf_tilingpattern.cpp
index 46a59db..f7f9e84 100644
--- a/core/fpdfapi/page/cpdf_tilingpattern.cpp
+++ b/core/fpdfapi/page/cpdf_tilingpattern.cpp
@@ -12,7 +12,6 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_object.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
-#include "third_party/base/ptr_util.h"
CPDF_TilingPattern::CPDF_TilingPattern(CPDF_Document* pDoc,
CPDF_Object* pPatternObj,
@@ -40,7 +39,7 @@
return nullptr;
const CFX_Matrix& matrix = parent_matrix();
- auto form = pdfium::MakeUnique<CPDF_Form>(document(), nullptr, pStream);
+ auto form = std::make_unique<CPDF_Form>(document(), nullptr, pStream);
CPDF_AllStates allStates;
allStates.m_ColorState.Emplace();
diff --git a/core/fpdfapi/parser/cfdf_document.cpp b/core/fpdfapi/parser/cfdf_document.cpp
index 054f999..b9dc188 100644
--- a/core/fpdfapi/parser/cfdf_document.cpp
+++ b/core/fpdfapi/parser/cfdf_document.cpp
@@ -14,7 +14,6 @@
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcrt/cfx_readonlymemorystream.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/span.h"
CFDF_Document::CFDF_Document() = default;
@@ -22,7 +21,7 @@
CFDF_Document::~CFDF_Document() = default;
std::unique_ptr<CFDF_Document> CFDF_Document::CreateNewDoc() {
- auto pDoc = pdfium::MakeUnique<CFDF_Document>();
+ auto pDoc = std::make_unique<CFDF_Document>();
pDoc->m_pRootDict.Reset(pDoc->NewIndirect<CPDF_Dictionary>());
pDoc->m_pRootDict->SetNewFor<CPDF_Dictionary>("FDF");
return pDoc;
@@ -30,7 +29,7 @@
std::unique_ptr<CFDF_Document> CFDF_Document::ParseMemory(
pdfium::span<const uint8_t> span) {
- auto pDoc = pdfium::MakeUnique<CFDF_Document>();
+ auto pDoc = std::make_unique<CFDF_Document>();
pDoc->ParseStream(pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>(span));
return pDoc->m_pRootDict ? std::move(pDoc) : nullptr;
}
diff --git a/core/fpdfapi/parser/cpdf_array_unittest.cpp b/core/fpdfapi/parser/cpdf_array_unittest.cpp
index 171a7e4..aea94d1 100644
--- a/core/fpdfapi/parser/cpdf_array_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_array_unittest.cpp
@@ -12,7 +12,6 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fxcrt/fx_memory.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
TEST(cpdf_array, GetBooleanAt) {
auto arr = pdfium::MakeRetain<CPDF_Array>();
@@ -133,7 +132,7 @@
{1, 2, 3, 4, 5}, {10, 9, 8, 7, 6}, {11, 12, 13, 14, 15}};
auto arr = pdfium::MakeRetain<CPDF_Array>();
// Indirect references to indirect objects.
- auto obj_holder = pdfium::MakeUnique<CPDF_IndirectObjectHolder>();
+ auto obj_holder = std::make_unique<CPDF_IndirectObjectHolder>();
for (size_t i = 0; i < kNumOfRows; ++i) {
auto arr_elem = pdfium::MakeRetain<CPDF_Array>();
for (size_t j = 0; j < kNumOfRowElems; ++j) {
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp
index 6cdc3f1..644d1cb 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp
@@ -10,13 +10,12 @@
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
#include "core/fxcrt/cfx_readonlymemorystream.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
namespace {
std::unique_ptr<CPDF_SyntaxParser> MakeParserForBuffer(
pdfium::span<const uint8_t> buffer) {
- return pdfium::MakeUnique<CPDF_SyntaxParser>(
+ return std::make_unique<CPDF_SyntaxParser>(
pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>(buffer));
}
@@ -39,8 +38,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(xref_table);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataAvailable, cross_ref_avail->CheckAvail());
}
@@ -56,8 +55,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(xref_stream);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataAvailable, cross_ref_avail->CheckAvail());
}
@@ -74,8 +73,8 @@
const FX_FILESIZE last_crossref_offset = 70000;
auto parser = MakeParserForBuffer(xref_stream);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
@@ -91,8 +90,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(xref_stream);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
@@ -113,8 +112,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(xref_table);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
@@ -125,8 +124,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(incorrect_data);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
@@ -173,8 +172,8 @@
const FX_FILESIZE last_crossref_offset = static_cast<FX_FILESIZE>(cur_offset);
auto parser = MakeParserForBuffer(pdfium::as_bytes(pdfium::make_span(table)));
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataAvailable, cross_ref_avail->CheckAvail());
}
@@ -217,8 +216,8 @@
const FX_FILESIZE last_crossref_offset = static_cast<FX_FILESIZE>(cur_offset);
auto parser = MakeParserForBuffer(pdfium::as_bytes(pdfium::make_span(table)));
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataAvailable, cross_ref_avail->CheckAvail());
}
@@ -266,8 +265,8 @@
const FX_FILESIZE last_crossref_offset = last_v4_table_offset;
auto parser = MakeParserForBuffer(pdfium::as_bytes(pdfium::make_span(table)));
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataAvailable, cross_ref_avail->CheckAvail());
}
@@ -280,8 +279,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(invalid_xref_stream);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
@@ -303,8 +302,8 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(xref_table);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
@@ -319,7 +318,7 @@
const FX_FILESIZE last_crossref_offset = 0;
auto parser = MakeParserForBuffer(xref_stream);
- auto cross_ref_avail = pdfium::MakeUnique<CPDF_CrossRefAvail>(
- parser.get(), last_crossref_offset);
+ auto cross_ref_avail =
+ std::make_unique<CPDF_CrossRefAvail>(parser.get(), last_crossref_offset);
EXPECT_EQ(CPDF_DataAvail::DataError, cross_ref_avail->CheckAvail());
}
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp
index 417fd72..f8eb116 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_data_avail.cpp
@@ -28,7 +28,6 @@
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/compiler_specific.h"
#include "third_party/base/numerics/safe_conversions.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -183,8 +182,8 @@
return false;
}
- m_pCrossRefAvail = pdfium::MakeUnique<CPDF_CrossRefAvail>(GetSyntaxParser(),
- last_xref_offset);
+ m_pCrossRefAvail = std::make_unique<CPDF_CrossRefAvail>(GetSyntaxParser(),
+ last_xref_offset);
}
switch (m_pCrossRefAvail->CheckAvail()) {
@@ -492,7 +491,7 @@
return DocAvailStatus::DataError;
m_parser.m_pSyntax =
- pdfium::MakeUnique<CPDF_SyntaxParser>(GetValidator(), *header_offset);
+ std::make_unique<CPDF_SyntaxParser>(GetValidator(), *header_offset);
m_pLinearized = m_parser.ParseLinearizedHeader();
if (GetValidator()->has_read_problems())
return DocAvailStatus::DataNotAvailable;
@@ -548,7 +547,7 @@
if (!pKid)
continue;
- auto pNode = pdfium::MakeUnique<PageNode>();
+ auto pNode = std::make_unique<PageNode>();
pNode->m_dwPageNo = pKid->GetRefObjNum();
pPageNode->m_ChildNodes.push_back(std::move(pNode));
}
@@ -601,7 +600,7 @@
switch (pKids->GetType()) {
case CPDF_Object::kReference: {
CPDF_Reference* pKid = pKids->AsReference();
- auto pNode = pdfium::MakeUnique<PageNode>();
+ auto pNode = std::make_unique<PageNode>();
pNode->m_dwPageNo = pKid->GetRefObjNum();
pPageNode->m_ChildNodes.push_back(std::move(pNode));
break;
@@ -613,7 +612,7 @@
if (!pKid)
continue;
- auto pNode = pdfium::MakeUnique<PageNode>();
+ auto pNode = std::make_unique<PageNode>();
pNode->m_dwPageNo = pKid->GetRefObjNum();
pPageNode->m_ChildNodes.push_back(std::move(pNode));
}
@@ -808,7 +807,7 @@
return DataError;
auto page_num_obj = std::make_pair(
- dwPage, pdfium::MakeUnique<CPDF_PageObjectAvail>(
+ dwPage, std::make_unique<CPDF_PageObjectAvail>(
GetValidator(), m_pDocument.Get(), pPageDict));
CPDF_PageObjectAvail* page_obj_avail =
@@ -860,7 +859,7 @@
{
auto page_num_obj = std::make_pair(
- dwPage, pdfium::MakeUnique<CPDF_PageObjectAvail>(
+ dwPage, std::make_unique<CPDF_PageObjectAvail>(
GetValidator(), m_pDocument.Get(), pPageDict));
CPDF_PageObjectAvail* page_obj_avail =
m_PagesObjAvail.insert(std::move(page_num_obj)).first->second.get();
@@ -893,7 +892,7 @@
CPDF_PageObjectAvail* resource_avail =
m_PagesResourcesAvail
.insert(std::make_pair(
- resources, pdfium::MakeUnique<CPDF_PageObjectAvail>(
+ resources, std::make_unique<CPDF_PageObjectAvail>(
GetValidator(), m_pDocument.Get(), resources)))
.first->second.get();
return resource_avail->CheckAvail();
@@ -972,7 +971,7 @@
if (!pAcroForm)
return FormNotExist;
- m_pFormAvail = pdfium::MakeUnique<CPDF_PageObjectAvail>(
+ m_pFormAvail = std::make_unique<CPDF_PageObjectAvail>(
GetValidator(), m_pDocument.Get(), pAcroForm);
}
switch (m_pFormAvail->CheckAvail()) {
@@ -1006,8 +1005,8 @@
// We already returned parsed document.
return std::make_pair(CPDF_Parser::HANDLER_ERROR, nullptr);
}
- auto document = pdfium::MakeUnique<CPDF_Document>(std::move(pRenderData),
- std::move(pPageData));
+ auto document = std::make_unique<CPDF_Document>(std::move(pRenderData),
+ std::move(pPageData));
document->AddObserver(this);
CPDF_ReadValidator::Session read_session(GetValidator());
diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp
index 3bf1006..2171c74 100644
--- a/core/fpdfapi/parser/cpdf_document.cpp
+++ b/core/fpdfapi/parser/cpdf_document.cpp
@@ -16,7 +16,6 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fxcodec/jbig2/JBig2_DocumentContext.h"
#include "core/fxcrt/fx_codepage.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -142,7 +141,7 @@
const RetainPtr<IFX_SeekableReadStream>& pFileAccess,
const char* password) {
if (!m_pParser)
- SetParser(pdfium::MakeUnique<CPDF_Parser>(this));
+ SetParser(std::make_unique<CPDF_Parser>(this));
return HandleLoadResult(m_pParser->StartParse(pFileAccess, password));
}
@@ -151,7 +150,7 @@
const RetainPtr<CPDF_ReadValidator>& validator,
const char* password) {
if (!m_pParser)
- SetParser(pdfium::MakeUnique<CPDF_Parser>(this));
+ SetParser(std::make_unique<CPDF_Parser>(this));
return HandleLoadResult(m_pParser->StartLinearizedParse(validator, password));
}
diff --git a/core/fpdfapi/parser/cpdf_document_unittest.cpp b/core/fpdfapi/parser/cpdf_document_unittest.cpp
index c5d5da5..6b149a5 100644
--- a/core/fpdfapi/parser/cpdf_document_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_document_unittest.cpp
@@ -20,7 +20,6 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/render/cpdf_docrenderdata.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -51,8 +50,8 @@
class CPDF_TestDocumentForPages final : public CPDF_Document {
public:
CPDF_TestDocumentForPages()
- : CPDF_Document(pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>()) {
+ : CPDF_Document(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>()) {
// Set up test
auto zeroToTwo = pdfium::MakeRetain<CPDF_Array>();
zeroToTwo->AppendNew<CPDF_Reference>(
@@ -104,8 +103,8 @@
class CPDF_TestDocumentWithPageWithoutPageNum final : public CPDF_Document {
public:
CPDF_TestDocumentWithPageWithoutPageNum()
- : CPDF_Document(pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>()) {
+ : CPDF_Document(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>()) {
// Set up test
auto allPages = pdfium::MakeRetain<CPDF_Array>();
allPages->AppendNew<CPDF_Reference>(
@@ -136,8 +135,8 @@
class CPDF_TestDocPagesWithoutKids final : public CPDF_Document {
public:
CPDF_TestDocPagesWithoutKids()
- : CPDF_Document(pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>()) {
+ : CPDF_Document(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>()) {
CPDF_Dictionary* pagesDict = NewIndirect<CPDF_Dictionary>();
pagesDict->SetNewFor<CPDF_Name>("Type", "Pages");
pagesDict->SetNewFor<CPDF_Number>("Count", 3);
@@ -150,8 +149,8 @@
class CPDF_TestDocumentAllowSetParser final : public CPDF_Document {
public:
CPDF_TestDocumentAllowSetParser()
- : CPDF_Document(pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>()) {}
+ : CPDF_Document(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>()) {}
using CPDF_Document::SetParser;
};
@@ -166,7 +165,7 @@
TEST_F(cpdf_document_test, GetPages) {
std::unique_ptr<CPDF_TestDocumentForPages> document =
- pdfium::MakeUnique<CPDF_TestDocumentForPages>();
+ std::make_unique<CPDF_TestDocumentForPages>();
for (int i = 0; i < kNumTestPages; i++) {
CPDF_Dictionary* page = document->GetPageDictionary(i);
ASSERT_TRUE(page);
@@ -178,7 +177,7 @@
}
TEST_F(cpdf_document_test, GetPageWithoutObjNumTwice) {
- auto document = pdfium::MakeUnique<CPDF_TestDocumentWithPageWithoutPageNum>();
+ auto document = std::make_unique<CPDF_TestDocumentWithPageWithoutPageNum>();
CPDF_Dictionary* page = document->GetPageDictionary(2);
ASSERT_TRUE(page);
ASSERT_EQ(document->inlined_page(), page);
@@ -190,7 +189,7 @@
TEST_F(cpdf_document_test, GetPagesReverseOrder) {
std::unique_ptr<CPDF_TestDocumentForPages> document =
- pdfium::MakeUnique<CPDF_TestDocumentForPages>();
+ std::make_unique<CPDF_TestDocumentForPages>();
for (int i = 6; i >= 0; i--) {
CPDF_Dictionary* page = document->GetPageDictionary(i);
ASSERT_TRUE(page);
@@ -203,7 +202,7 @@
TEST_F(cpdf_document_test, GetPagesInDisorder) {
std::unique_ptr<CPDF_TestDocumentForPages> document =
- pdfium::MakeUnique<CPDF_TestDocumentForPages>();
+ std::make_unique<CPDF_TestDocumentForPages>();
CPDF_Dictionary* page = document->GetPageDictionary(1);
ASSERT_TRUE(page);
@@ -266,9 +265,9 @@
linearization_dict->SetNewFor<CPDF_Number>("N", kPageCount);
linearization_dict->SetNewFor<CPDF_Number>("O", first_page_obj_num);
- auto parser = pdfium::MakeUnique<CPDF_Parser>();
+ auto parser = std::make_unique<CPDF_Parser>();
parser->SetLinearizedHeaderForTesting(
- pdfium::MakeUnique<TestLinearized>(linearization_dict.Get()));
+ std::make_unique<TestLinearized>(linearization_dict.Get()));
document.SetParser(std::move(parser));
}
@@ -288,7 +287,7 @@
TEST_F(cpdf_document_test, CountGreaterThanPageTree) {
std::unique_ptr<CPDF_TestDocumentForPages> document =
- pdfium::MakeUnique<CPDF_TestDocumentForPages>();
+ std::make_unique<CPDF_TestDocumentForPages>();
document->SetTreeSize(kNumTestPages + 3);
for (int i = 0; i < kNumTestPages; i++)
EXPECT_TRUE(document->GetPageDictionary(i));
@@ -299,7 +298,7 @@
TEST_F(cpdf_document_test, PagesWithoutKids) {
// Set up a document with Pages dict without kids, and Count = 3
- auto pDoc = pdfium::MakeUnique<CPDF_TestDocPagesWithoutKids>();
+ auto pDoc = std::make_unique<CPDF_TestDocPagesWithoutKids>();
EXPECT_TRUE(pDoc->GetPageDictionary(0));
// Test GetPage does not fetch pages out of range
for (int i = 1; i < 5; i++)
diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp
index e051254..3df802d 100644
--- a/core/fpdfapi/parser/cpdf_hint_tables.cpp
+++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp
@@ -20,7 +20,6 @@
#include "core/fxcrt/cfx_bitstream.h"
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/numerics/safe_conversions.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/span.h"
namespace {
@@ -67,7 +66,7 @@
if (!hints_stream)
return nullptr;
- auto pHintTables = pdfium::MakeUnique<CPDF_HintTables>(
+ auto pHintTables = std::make_unique<CPDF_HintTables>(
parser->GetValidator().Get(), pLinearized);
if (!pHintTables->LoadHintStream(hints_stream.Get()))
return nullptr;
diff --git a/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp b/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp
index 27592ba..874c581 100644
--- a/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp
@@ -21,7 +21,6 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -36,7 +35,7 @@
std::unique_ptr<CPDF_DataAvail> MakeDataAvailFromFile(
const std::string& file_name) {
- return pdfium::MakeUnique<CPDF_DataAvail>(
+ return std::make_unique<CPDF_DataAvail>(
nullptr, MakeValidatorFromFile(file_name), true);
}
@@ -53,7 +52,7 @@
RetainPtr<CPDF_Dictionary> dict =
ToDictionary(parser.GetObjectBody(nullptr));
ASSERT(dict);
- return pdfium::MakeUnique<TestLinearizedHeader>(dict.Get(), 0);
+ return std::make_unique<TestLinearizedHeader>(dict.Get(), 0);
}
};
@@ -172,8 +171,8 @@
CPDF_SyntaxParser parser(validator, 0);
RetainPtr<CPDF_Stream> stream = ToStream(parser.GetObjectBody(nullptr));
ASSERT_TRUE(stream);
- auto hint_tables = pdfium::MakeUnique<CPDF_HintTables>(
- validator.Get(), linearized_header.get());
+ auto hint_tables = std::make_unique<CPDF_HintTables>(validator.Get(),
+ linearized_header.get());
// Check that hint table will load.
ASSERT_TRUE(hint_tables->LoadHintStream(stream.Get()));
// Check that hint table have correct first page offset.
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
index b2e1b54..d8efb1d 100644
--- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
+++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp
@@ -12,7 +12,6 @@
#include "core/fpdfapi/parser/cpdf_object.h"
#include "core/fpdfapi/parser/cpdf_parser.h"
#include "third_party/base/logging.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -23,8 +22,7 @@
} // namespace
CPDF_IndirectObjectHolder::CPDF_IndirectObjectHolder()
- : m_LastObjNum(0),
- m_pByteStringPool(pdfium::MakeUnique<ByteStringPool>()) {}
+ : m_LastObjNum(0), m_pByteStringPool(std::make_unique<ByteStringPool>()) {}
CPDF_IndirectObjectHolder::~CPDF_IndirectObjectHolder() {
m_pByteStringPool.DeleteObject(); // Make weak.
diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp
index ab261d9..4930e9c 100644
--- a/core/fpdfapi/parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "core/fpdfapi/parser/cpdf_object.h"
+
#include <memory>
#include <string>
#include <utility>
@@ -21,7 +23,6 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fxcrt/fx_memory_wrappers.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -97,7 +98,7 @@
m_DirectObjs.emplace_back(objs[i]);
// Indirect references to indirect objects.
- m_ObjHolder = pdfium::MakeUnique<CPDF_IndirectObjectHolder>();
+ m_ObjHolder = std::make_unique<CPDF_IndirectObjectHolder>();
m_IndirectObjs = {m_ObjHolder->AddIndirectObject(boolean_true_obj->Clone()),
m_ObjHolder->AddIndirectObject(number_int_obj->Clone()),
m_ObjHolder->AddIndirectObject(str_spec_obj->Clone()),
@@ -735,7 +736,7 @@
}
TEST(PDFArrayTest, AddReferenceAndGetObjectAt) {
- auto holder = pdfium::MakeUnique<CPDF_IndirectObjectHolder>();
+ auto holder = std::make_unique<CPDF_IndirectObjectHolder>();
auto boolean_obj = pdfium::MakeRetain<CPDF_Boolean>(true);
auto int_obj = pdfium::MakeRetain<CPDF_Number>(-1234);
auto float_obj = pdfium::MakeRetain<CPDF_Number>(2345.089f);
@@ -986,7 +987,7 @@
}
TEST(PDFRefernceTest, MakeReferenceToReference) {
- auto obj_holder = pdfium::MakeUnique<CPDF_IndirectObjectHolder>();
+ auto obj_holder = std::make_unique<CPDF_IndirectObjectHolder>();
auto original_ref = pdfium::MakeRetain<CPDF_Reference>(obj_holder.get(), 42);
original_ref->SetObjNum(1952);
ASSERT_FALSE(original_ref->IsInline());
diff --git a/core/fpdfapi/parser/cpdf_object_walker.cpp b/core/fpdfapi/parser/cpdf_object_walker.cpp
index efd4a5c..23d4271 100644
--- a/core/fpdfapi/parser/cpdf_object_walker.cpp
+++ b/core/fpdfapi/parser/cpdf_object_walker.cpp
@@ -9,7 +9,6 @@
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -119,11 +118,11 @@
std::unique_ptr<CPDF_ObjectWalker::SubobjectIterator>
CPDF_ObjectWalker::MakeIterator(const CPDF_Object* object) {
if (object->IsStream())
- return pdfium::MakeUnique<StreamIterator>(object->AsStream());
+ return std::make_unique<StreamIterator>(object->AsStream());
if (object->IsDictionary())
- return pdfium::MakeUnique<DictionaryIterator>(object->AsDictionary());
+ return std::make_unique<DictionaryIterator>(object->AsDictionary());
if (object->IsArray())
- return pdfium::MakeUnique<ArrayIterator>(object->AsArray());
+ return std::make_unique<ArrayIterator>(object->AsArray());
return nullptr;
}
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 3ae3aec..2fbd78c 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -28,7 +28,6 @@
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_memory_wrappers.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -58,9 +57,9 @@
CPDF_Parser::CPDF_Parser(ParsedObjectsHolder* holder)
: m_pObjectsHolder(holder),
- m_CrossRefTable(pdfium::MakeUnique<CPDF_CrossRefTable>()) {
+ m_CrossRefTable(std::make_unique<CPDF_CrossRefTable>()) {
if (!holder) {
- m_pOwnedObjectsHolder = pdfium::MakeUnique<ObjectsHolderStub>();
+ m_pOwnedObjectsHolder = std::make_unique<ObjectsHolderStub>();
m_pObjectsHolder = m_pOwnedObjectsHolder.get();
}
}
@@ -121,7 +120,7 @@
if (validator->GetSize() < *header_offset + kPDFHeaderSize)
return false;
- m_pSyntax = pdfium::MakeUnique<CPDF_SyntaxParser>(validator, *header_offset);
+ m_pSyntax = std::make_unique<CPDF_SyntaxParser>(validator, *header_offset);
return ParseFileVersion();
}
@@ -326,7 +325,7 @@
pDict->GetIntegerFor("XRefStm"));
m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
- pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pDict)),
+ std::make_unique<CPDF_CrossRefTable>(std::move(pDict)),
std::move(m_CrossRefTable));
}
@@ -365,7 +364,7 @@
// Merge the trailers.
m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
- pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(main_trailer)),
+ std::make_unique<CPDF_CrossRefTable>(std::move(main_trailer)),
std::move(m_CrossRefTable));
// Now GetTrailer() returns the merged trailer, where /Prev is from the
@@ -393,7 +392,7 @@
pDict->GetIntegerFor("XRefStm"));
m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
- pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pDict)),
+ std::make_unique<CPDF_CrossRefTable>(std::move(pDict)),
std::move(m_CrossRefTable));
}
@@ -583,7 +582,7 @@
}
bool CPDF_Parser::RebuildCrossRef() {
- auto cross_ref_table = pdfium::MakeUnique<CPDF_CrossRefTable>();
+ auto cross_ref_table = std::make_unique<CPDF_CrossRefTable>();
const uint32_t kBufferSize = 4096;
m_pSyntax->SetReadBufferSize(kBufferSize);
@@ -610,7 +609,7 @@
if (pTrailer) {
cross_ref_table = CPDF_CrossRefTable::MergeUp(
std::move(cross_ref_table),
- pdfium::MakeUnique<CPDF_CrossRefTable>(ToDictionary(
+ std::make_unique<CPDF_CrossRefTable>(ToDictionary(
pTrailer->IsStream() ? pTrailer->AsStream()->GetDict()->Clone()
: std::move(pTrailer))));
}
@@ -627,7 +626,7 @@
if (pStream && pStream->GetDict()->GetStringFor("Type") == "XRef") {
cross_ref_table = CPDF_CrossRefTable::MergeUp(
std::move(cross_ref_table),
- pdfium::MakeUnique<CPDF_CrossRefTable>(
+ std::make_unique<CPDF_CrossRefTable>(
ToDictionary(pStream->GetDict()->Clone())));
}
@@ -671,11 +670,11 @@
RetainPtr<CPDF_Dictionary> pNewTrailer = ToDictionary(pDict->Clone());
if (bMainXRef) {
m_CrossRefTable =
- pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pNewTrailer));
+ std::make_unique<CPDF_CrossRefTable>(std::move(pNewTrailer));
m_CrossRefTable->ShrinkObjectMap(size);
} else {
m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
- pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pNewTrailer)),
+ std::make_unique<CPDF_CrossRefTable>(std::move(pNewTrailer)),
std::move(m_CrossRefTable));
}
diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp
index 06328f0..f69416e 100644
--- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "core/fpdfapi/parser/cpdf_parser.h"
+
#include <limits>
#include <memory>
#include <string>
@@ -9,7 +11,6 @@
#include "core/fpdfapi/parser/cpdf_linearized_header.h"
#include "core/fpdfapi/parser/cpdf_object.h"
-#include "core/fpdfapi/parser/cpdf_parser.h"
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
#include "core/fxcrt/cfx_readonlymemorystream.h"
#include "core/fxcrt/fx_extension.h"
@@ -17,7 +18,6 @@
#include "core/fxcrt/retain_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -43,7 +43,7 @@
return false;
// For the test file, the header is set at the beginning.
- m_pSyntax = pdfium::MakeUnique<CPDF_SyntaxParser>(pFileAccess);
+ m_pSyntax = std::make_unique<CPDF_SyntaxParser>(pFileAccess);
return true;
}
diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp
index 477717f..e1e8c77 100644
--- a/core/fpdfapi/parser/cpdf_security_handler.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler.cpp
@@ -19,7 +19,6 @@
#include "core/fpdfapi/parser/cpdf_object.h"
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fxcrt/fx_random.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -718,5 +717,5 @@
void CPDF_SecurityHandler::InitCryptoHandler() {
m_pCryptoHandler =
- pdfium::MakeUnique<CPDF_CryptoHandler>(m_Cipher, m_EncryptKey, m_KeyLen);
+ std::make_unique<CPDF_CryptoHandler>(m_Cipher, m_EncryptKey, m_KeyLen);
}
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
index cf65f6e..d1d05f6 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
@@ -28,7 +28,6 @@
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/numerics/safe_math.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -76,7 +75,7 @@
std::unique_ptr<CPDF_SyntaxParser> CPDF_SyntaxParser::CreateForTesting(
const RetainPtr<IFX_SeekableReadStream>& pFileAccess,
FX_FILESIZE HeaderOffset) {
- return pdfium::MakeUnique<CPDF_SyntaxParser>(
+ return std::make_unique<CPDF_SyntaxParser>(
pdfium::MakeRetain<CPDF_ReadValidator>(pFileAccess, nullptr),
HeaderOffset);
}
diff --git a/core/fpdfapi/parser/fpdf_parser_utility_unittest.cpp b/core/fpdfapi/parser/fpdf_parser_utility_unittest.cpp
index e68798c..3e4d968 100644
--- a/core/fpdfapi/parser/fpdf_parser_utility_unittest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_utility_unittest.cpp
@@ -4,6 +4,8 @@
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
+#include <memory>
+
#include "core/fpdfapi/page/cpdf_docpagedata.h"
#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ -13,7 +15,6 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/render/cpdf_docrenderdata.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/ptr_util.h"
TEST(fpdf_parser_utility, PDF_NameDecode) {
EXPECT_EQ("", PDF_NameDecode(""));
@@ -90,9 +91,9 @@
{
// Indirect dictionary.
- auto doc = pdfium::MakeUnique<CPDF_Document>(
- pdfium::MakeUnique<CPDF_DocRenderData>(),
- pdfium::MakeUnique<CPDF_DocPageData>());
+ auto doc =
+ std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
+ std::make_unique<CPDF_DocPageData>());
auto dict = doc->New<CPDF_Dictionary>();
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index b752e44..54a5153 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -34,7 +34,6 @@
#include "core/fxge/dib/cfx_dibitmap.h"
#include "core/fxge/dib/cfx_imagestretcher.h"
#include "core/fxge/dib/cfx_imagetransformer.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
#ifdef _SKIA_SUPPORT_
@@ -424,7 +423,7 @@
FX_RECT clip_box = m_pRenderStatus->GetRenderDevice()->GetClipBox();
clip_box.Intersect(image_rect.value());
m_Mode = Mode::kTransform;
- m_pTransformer = pdfium::MakeUnique<CFX_ImageTransformer>(
+ m_pTransformer = std::make_unique<CFX_ImageTransformer>(
m_pDIBBase, m_ImageMatrix, m_ResampleOptions, &clip_box);
return true;
}
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp
index 7e4734a..c0885e4 100644
--- a/core/fpdfapi/render/cpdf_pagerendercache.cpp
+++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp
@@ -14,7 +14,6 @@
#include "core/fpdfapi/render/cpdf_imagecacheentry.h"
#include "core/fpdfapi/render/cpdf_renderstatus.h"
#include "core/fxge/dib/cfx_dibitmap.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -82,8 +81,8 @@
if (m_bCurFindCache) {
m_pCurImageCacheEntry = it->second.get();
} else {
- m_pCurImageCacheEntry = pdfium::MakeUnique<CPDF_ImageCacheEntry>(
- m_pPage->GetDocument(), pImage);
+ m_pCurImageCacheEntry =
+ std::make_unique<CPDF_ImageCacheEntry>(m_pPage->GetDocument(), pImage);
}
CPDF_DIB::LoadState ret = m_pCurImageCacheEntry->StartGetCachedBitmap(
m_pPage->m_pPageResources.Get(), pRenderStatus, bStdCS);
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
index 6e5fc36..5e94df8 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp
@@ -15,7 +15,6 @@
#include "core/fpdfapi/render/cpdf_renderstatus.h"
#include "core/fxcrt/pauseindicator_iface.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "third_party/base/ptr_util.h"
CPDF_ProgressiveRenderer::CPDF_ProgressiveRenderer(
CPDF_RenderContext* pContext,
@@ -48,8 +47,8 @@
}
m_pCurrentLayer = m_pContext->GetLayer(m_LayerIndex);
m_LastObjectRendered = m_pCurrentLayer->m_pObjectHolder->end();
- m_pRenderStatus = pdfium::MakeUnique<CPDF_RenderStatus>(m_pContext.Get(),
- m_pDevice.Get());
+ m_pRenderStatus = std::make_unique<CPDF_RenderStatus>(m_pContext.Get(),
+ m_pDevice.Get());
if (m_pOptions)
m_pRenderStatus->SetOptions(*m_pOptions);
m_pRenderStatus->SetTransparency(
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index f7ef050..97bd732 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -63,7 +63,6 @@
#include "core/fxge/text_glyph_pos.h"
#include "third_party/base/compiler_specific.h"
#include "third_party/base/logging.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
#ifdef _SKIA_SUPPORT_
@@ -277,7 +276,7 @@
return false;
}
- m_pImageRenderer = pdfium::MakeUnique<CPDF_ImageRenderer>();
+ m_pImageRenderer = std::make_unique<CPDF_ImageRenderer>();
if (!m_pImageRenderer->Start(this, pObj->AsImage(), mtObj2Device, false,
BlendMode::kNormal)) {
if (!m_pImageRenderer->GetResult())
@@ -557,7 +556,7 @@
CPDF_TextObject* pText = ClipPath.GetText(i);
if (pText) {
if (!pTextClippingPath)
- pTextClippingPath = pdfium::MakeUnique<CFX_PathData>();
+ pTextClippingPath = std::make_unique<CFX_PathData>();
ProcessText(pText, mtObj2Device, pTextClippingPath.get());
continue;
}
@@ -820,7 +819,7 @@
if (!pSrcStates)
return nullptr;
- auto pStates = pdfium::MakeUnique<CPDF_GraphicStates>();
+ auto pStates = std::make_unique<CPDF_GraphicStates>();
pStates->CopyStates(*pSrcStates);
const CPDF_Color* pObjColor = bStroke
? pSrcStates->m_ColorState.GetStrokeColor()
diff --git a/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp b/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
index 8536b3b..3f6c5c7 100644
--- a/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
+++ b/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
@@ -10,7 +10,6 @@
#include "core/fpdfapi/render/cpdf_rendercontext.h"
#include "core/fxge/cfx_defaultrenderdevice.h"
#include "core/fxge/dib/cfx_dibitmap.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -37,7 +36,7 @@
m_pObject = pObj;
m_Matrix = CPDF_DeviceBuffer::CalculateMatrix(pDevice, rect, max_dpi,
/*scale=*/true);
- m_pBitmapDevice = pdfium::MakeUnique<CFX_DefaultRenderDevice>();
+ m_pBitmapDevice = std::make_unique<CFX_DefaultRenderDevice>();
bool bIsAlpha =
!!(m_pDevice->GetDeviceCaps(FXDC_RENDER_CAPS) & FXRC_ALPHA_OUTPUT);
FXDIB_Format dibFormat = bIsAlpha ? FXDIB_Argb : FXDIB_Rgb;
diff --git a/core/fpdfapi/render/cpdf_type3cache.cpp b/core/fpdfapi/render/cpdf_type3cache.cpp
index c67eb48..f5654e5 100644
--- a/core/fpdfapi/render/cpdf_type3cache.cpp
+++ b/core/fpdfapi/render/cpdf_type3cache.cpp
@@ -18,7 +18,6 @@
#include "core/fxge/cfx_glyphbitmap.h"
#include "core/fxge/dib/cfx_dibitmap.h"
#include "core/fxge/fx_dib.h"
-#include "third_party/base/ptr_util.h"
namespace {
@@ -97,7 +96,7 @@
CPDF_Type3GlyphMap* pSizeCache;
auto it = m_SizeMap.find(FaceGlyphsKey);
if (it == m_SizeMap.end()) {
- auto pNew = pdfium::MakeUnique<CPDF_Type3GlyphMap>();
+ auto pNew = std::make_unique<CPDF_Type3GlyphMap>();
pSizeCache = pNew.get();
m_SizeMap[FaceGlyphsKey] = std::move(pNew);
} else {
@@ -160,7 +159,7 @@
if (!pResBitmap)
return nullptr;
- auto pGlyph = pdfium::MakeUnique<CFX_GlyphBitmap>(left, -top);
+ auto pGlyph = std::make_unique<CFX_GlyphBitmap>(left, -top);
pGlyph->GetBitmap()->TakeOver(std::move(pResBitmap));
return pGlyph;
}
