summaryrefslogtreecommitdiff
path: root/fpdfsdk/fpdfxfa
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-09-28 17:04:51 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-28 17:04:51 -0700
commitd4c34f208aa3b76c5941395823c6dcf6bb7e2f34 (patch)
treeb0d73710639ddfe2fff5578e7cd6b761cd4052ed /fpdfsdk/fpdfxfa
parent5ef75ba52b1ce6024d6aa43b03e25824a04b469b (diff)
downloadpdfium-d4c34f208aa3b76c5941395823c6dcf6bb7e2f34.tar.xz
Replace std::unique_ptr.reset() with WrapUnique assignment.
fpdfsdk/ edition. Review-Url: https://codereview.chromium.org/2381723002
Diffstat (limited to 'fpdfsdk/fpdfxfa')
-rw-r--r--fpdfsdk/fpdfxfa/fpdfxfa_app.cpp4
-rw-r--r--fpdfsdk/fpdfxfa/fpdfxfa_page.cpp5
2 files changed, 6 insertions, 3 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
index 6295494621..ccaceac413 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
@@ -6,6 +6,8 @@
#include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h"
+#include <memory>
+
#include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h"
#include "fpdfsdk/include/cpdfsdk_environment.h"
#include "fpdfsdk/include/fsdk_define.h"
@@ -54,7 +56,7 @@ FX_BOOL CPDFXFA_App::Initialize(v8::Isolate* pIsolate) {
if (!m_pIsolate)
return FALSE;
- m_pXFAApp.reset(new CXFA_FFApp(this));
+ m_pXFAApp = WrapUnique(new CXFA_FFApp(this));
m_pXFAApp->SetDefaultFontMgr(
std::unique_ptr<CXFA_DefFontMgr>(new CXFA_DefFontMgr));
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
index 451175a9a4..3567524c65 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
@@ -39,7 +39,7 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage() {
return FALSE;
if (!m_pPDFPage || m_pPDFPage->m_pFormDict != pDict) {
- m_pPDFPage.reset(new CPDF_Page(pPDFDoc, pDict, true));
+ m_pPDFPage = WrapUnique(new CPDF_Page(pPDFDoc, pDict, true));
m_pPDFPage->ParseContent();
}
return TRUE;
@@ -87,7 +87,8 @@ FX_BOOL CPDFXFA_Page::LoadPDFPage(CPDF_Dictionary* pageDict) {
if (!m_pDocument || m_iPageIndex < 0 || !pageDict)
return FALSE;
- m_pPDFPage.reset(new CPDF_Page(m_pDocument->GetPDFDoc(), pageDict, true));
+ m_pPDFPage =
+ WrapUnique(new CPDF_Page(m_pDocument->GetPDFDoc(), pageDict, true));
m_pPDFPage->ParseContent();
return TRUE;
}