From d4c34f208aa3b76c5941395823c6dcf6bb7e2f34 Mon Sep 17 00:00:00 2001 From: thestig Date: Wed, 28 Sep 2016 17:04:51 -0700 Subject: Replace std::unique_ptr.reset() with WrapUnique assignment. fpdfsdk/ edition. Review-Url: https://codereview.chromium.org/2381723002 --- fpdfsdk/fpdfxfa/fpdfxfa_app.cpp | 4 +++- fpdfsdk/fpdfxfa/fpdfxfa_page.cpp | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/fpdfxfa') 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 + #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(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; } -- cgit v1.2.3