From 247524926e7a52eb373942fa6d35509f20ed1a77 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Fri, 30 Oct 2015 16:08:20 -0700 Subject: Merge to XFA: Convert a bunch of raw pointers in fsdk_mgr to unique_ptrs. Conflicts in both files. R=tsepez@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/1425233002 . (cherry picked from commit 34c509e0e0fbd64d4380f130c48434b07f60b69e) Review URL: https://codereview.chromium.org/1421983008 . --- fpdfsdk/include/fsdk_mgr.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 85a04c6eec..bfbbd63ac0 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -451,7 +451,7 @@ class CPDFDoc_Environment final { CPDFSDK_Document* GetSDKDocument() const { return m_pSDKDoc; } CPDFXFA_Document* GetPDFXFADocument() const { return m_pXFADoc; } CFX_ByteString GetAppName() const { return ""; } - IFX_SystemHandler* GetSysHandler() const { return m_pSysHandler; } + IFX_SystemHandler* GetSysHandler() const { return m_pSysHandler.get(); } FPDF_FORMFILLINFO* GetFormFillInfo() const { return m_pInfo; } CFFL_IFormFiller* GetIFormFiller(); // Creates if not present. @@ -460,14 +460,14 @@ class CPDFDoc_Environment final { CPDFSDK_ActionHandler* GetActionHander(); // Creates if not present. private: - CPDFSDK_AnnotHandlerMgr* m_pAnnotHandlerMgr; - CPDFSDK_ActionHandler* m_pActionHandler; + nonstd::unique_ptr m_pAnnotHandlerMgr; + nonstd::unique_ptr m_pActionHandler; nonstd::unique_ptr m_pJSRuntime; FPDF_FORMFILLINFO* const m_pInfo; CPDFSDK_Document* m_pSDKDoc; CPDFXFA_Document* const m_pXFADoc; - CFFL_IFormFiller* m_pIFormFiller; - IFX_SystemHandler* m_pSysHandler; + nonstd::unique_ptr m_pIFormFiller; + nonstd::unique_ptr m_pSysHandler; }; class CPDFSDK_Document { @@ -523,10 +523,10 @@ class CPDFSDK_Document { private: std::map m_pageMap; CPDFXFA_Document* m_pDoc; - CPDFSDK_InterForm* m_pInterForm; + nonstd::unique_ptr m_pInterForm; CPDFSDK_Annot* m_pFocusAnnot; CPDFDoc_Environment* m_pEnv; - CPDF_OCContext* m_pOccontent; + nonstd::unique_ptr m_pOccontent; FX_BOOL m_bChangeMask; FX_BOOL m_bBeingDestroyed; }; -- cgit v1.2.3