Convert pdfium::MakeUnique<> to std::make_unique<> in fpdfsdk
Use C++14 features.
-- ensure <memory> included in .cpp or corresponding .h file
-- remove ptr_util.h include unless WrapUnique() (3 cases).
Change-Id: I319cdb33ccadf94421edbeff5ea43e0e7cffa1c4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69955
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 0591408..d74ac22 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -24,7 +24,6 @@
#include "fpdfsdk/formfiller/cffl_formfiller.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fxjs/ijs_runtime.h"
-#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
FPDF_WIDESTRING AsFPDFWideString(ByteString* bsUTF16LE) {
@@ -325,14 +324,14 @@
CPDFSDK_ActionHandler* CPDFSDK_FormFillEnvironment::GetActionHandler() {
if (!m_pActionHandler)
- m_pActionHandler = pdfium::MakeUnique<CPDFSDK_ActionHandler>();
+ m_pActionHandler = std::make_unique<CPDFSDK_ActionHandler>();
return m_pActionHandler.get();
}
CFFL_InteractiveFormFiller*
CPDFSDK_FormFillEnvironment::GetInteractiveFormFiller() {
if (!m_pFormFiller)
- m_pFormFiller = pdfium::MakeUnique<CFFL_InteractiveFormFiller>(this);
+ m_pFormFiller = std::make_unique<CFFL_InteractiveFormFiller>(this);
return m_pFormFiller.get();
}
@@ -577,7 +576,7 @@
if (!renew)
return nullptr;
- auto pNew = pdfium::MakeUnique<CPDFSDK_PageView>(this, pUnderlyingPage);
+ auto pNew = std::make_unique<CPDFSDK_PageView>(this, pUnderlyingPage);
CPDFSDK_PageView* pPageView = pNew.get();
m_PageMap[pUnderlyingPage] = std::move(pNew);
@@ -666,7 +665,7 @@
CPDFSDK_InteractiveForm* CPDFSDK_FormFillEnvironment::GetInteractiveForm() {
if (!m_pInteractiveForm)
- m_pInteractiveForm = pdfium::MakeUnique<CPDFSDK_InteractiveForm>(this);
+ m_pInteractiveForm = std::make_unique<CPDFSDK_InteractiveForm>(this);
return m_pInteractiveForm.get();
}
@@ -777,7 +776,7 @@
CPDF_Dictionary* annot_dict = (*pAnnot)->GetPDFAnnot()->GetAnnotDict();
- auto focused_annot = pdfium::MakeUnique<CPDF_AnnotContext>(annot_dict, page);
+ auto focused_annot = std::make_unique<CPDF_AnnotContext>(annot_dict, page);
FPDF_ANNOTATION fpdf_annot =
FPDFAnnotationFromCPDFAnnotContext(focused_annot.get());