From ff8347a4b16f000be628c5e10d03a1e1c17537eb Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 17 Jun 2015 16:38:51 -0700 Subject: Replace some Release() calls with virtual destructors. A virtual method that does |delete this| is an anti-pattern. Some classes can be de-virtualized instead. Throw in some unique_ptrs and delete dead code for good measure. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1192013002. --- fpdfsdk/include/fsdk_actionhandler.h | 54 +++++++++++++++++------------------- fpdfsdk/include/fsdk_baseform.h | 12 ++++---- fpdfsdk/src/fpdfview.cpp | 20 ++++--------- fpdfsdk/src/fsdk_actionhandler.cpp | 29 ++----------------- fpdfsdk/src/fsdk_baseform.cpp | 16 ----------- fpdfsdk/src/fsdk_mgr.cpp | 32 ++++++++++----------- 6 files changed, 53 insertions(+), 110 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index 311380ec98..39ec4f41af 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -9,6 +9,7 @@ #include "../../core/include/fpdfdoc/fpdf_doc.h" #include "../../core/include/fxcrt/fx_string.h" +#include "../../third_party/base/nonstd_unique_ptr.h" #include "fsdk_baseform.h" class CFX_PtrList; @@ -36,53 +37,48 @@ public: FX_BOOL DoAction_Movie(const CPDF_Action& action, CPDFSDK_Document* pDocument); }; -class CPDFSDK_ActionHandler /*: public CReader_ActionHandler*/ +class CPDFSDK_ActionHandler { public: CPDFSDK_ActionHandler(CPDFDoc_Environment* pEvi); - virtual ~CPDFSDK_ActionHandler(); - virtual void Destroy(); - virtual FX_BOOL DoAction_DocOpen(const CPDF_Action& action, CPDFSDK_Document* pDocument/*, CPDFSDK_DocView *pDocView*/); - virtual FX_BOOL DoAction_JavaScript(const CPDF_Action& JsAction,CFX_WideString csJSName, CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/); - virtual FX_BOOL DoAction_Page(const CPDF_Action& action, enum CPDF_AAction::AActionType eType, CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/); - virtual FX_BOOL DoAction_Document(const CPDF_Action& action, enum CPDF_AAction::AActionType eType, CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/); - virtual FX_BOOL DoAction_BookMark(CPDF_Bookmark *pBookMark, const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/); - virtual FX_BOOL DoAction_Screen(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument,/* CReader_DocView *pDocView,*/ CPDFSDK_Annot* pScreen); - virtual FX_BOOL DoAction_Link(const CPDF_Action& action, CPDFSDK_Document* pDocument/*, CReader_DocView *pDocView*/); - virtual FX_BOOL DoAction_Field(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, /*CReader_DocView *pDocView,*/ CPDF_FormField* pFormField, PDFSDK_FieldAction& data); - virtual FX_BOOL DoAction_FieldJavaScript(const CPDF_Action& JsAction, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, PDFSDK_FieldAction& data); -public: - void SetFormActionHandler(CPDFSDK_FormActionHandler* pHandler); - void SetMediaActionHandler(CPDFSDK_MediaActionHandler* pHandler); + void SetMediaActionHandler(CPDFSDK_MediaActionHandler* pHandler); + + FX_BOOL DoAction_DocOpen(const CPDF_Action& action, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_JavaScript(const CPDF_Action& JsAction,CFX_WideString csJSName, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_Page(const CPDF_Action& action, enum CPDF_AAction::AActionType eType, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_Document(const CPDF_Action& action, enum CPDF_AAction::AActionType eType, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_BookMark(CPDF_Bookmark *pBookMark, const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_Screen(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDFSDK_Annot* pScreen); + FX_BOOL DoAction_Link(const CPDF_Action& action, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_Field(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, PDFSDK_FieldAction& data); + FX_BOOL DoAction_FieldJavaScript(const CPDF_Action& JsAction, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, PDFSDK_FieldAction& data); private: - FX_BOOL ExecuteDocumentOpenAction(const CPDF_Action& action, CPDFSDK_Document* pDocument, /*CReader_DocView *pDocView,*/ CFX_PtrList& list); - FX_BOOL ExecuteDocumentPageAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, /*CReader_DocView *pDocView,*/ CFX_PtrList& list); - FX_BOOL ExecuteFieldAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, /*CReader_DocView* pDocView,*/ CPDF_FormField* pFormField, PDFSDK_FieldAction& data, CFX_PtrList& list); - FX_BOOL ExecuteScreenAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, /*CReader_DocView* pDocView,*/ CPDFSDK_Annot* pScreen, CFX_PtrList& list); - FX_BOOL ExecuteBookMark(const CPDF_Action& action, CPDFSDK_Document* pDocument, /*CReader_DocView* pDocView,*/ CPDF_Bookmark* pBookmark, CFX_PtrList& list); - FX_BOOL ExecuteLinkAction(const CPDF_Action& action, CPDFSDK_Document* pDocument, /*CReader_DocView* pDocView,*/ CFX_PtrList& list); + FX_BOOL ExecuteDocumentOpenAction(const CPDF_Action& action, CPDFSDK_Document* pDocument, CFX_PtrList& list); + FX_BOOL ExecuteDocumentPageAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CFX_PtrList& list); + FX_BOOL ExecuteFieldAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, PDFSDK_FieldAction& data, CFX_PtrList& list); + FX_BOOL ExecuteScreenAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDFSDK_Annot* pScreen, CFX_PtrList& list); + FX_BOOL ExecuteBookMark(const CPDF_Action& action, CPDFSDK_Document* pDocument, CPDF_Bookmark* pBookmark, CFX_PtrList& list); + FX_BOOL ExecuteLinkAction(const CPDF_Action& action, CPDFSDK_Document* pDocument, CFX_PtrList& list); - void DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Document* pDocument/*, CReader_DocView* pDocView*/); + void DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Document* pDocument); void RunDocumentPageJavaScript(CPDFSDK_Document* pDocument, CPDF_AAction::AActionType type, const CFX_WideString& script); void RunDocumentOpenJavaScript(CPDFSDK_Document* pDocument, const CFX_WideString& sScriptName, const CFX_WideString& script); void RunFieldJavaScript(CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, CPDF_AAction::AActionType type, PDFSDK_FieldAction& data, const CFX_WideString& script); -private: FX_BOOL IsValidField(CPDFSDK_Document* pDocument, CPDF_Dictionary* pFieldDict); - FX_BOOL IsValidDocView(CPDFSDK_Document* pDocument/*, CReader_DocView* pDocView*/); + FX_BOOL IsValidDocView(CPDFSDK_Document* pDocument); - void DoAction_GoTo(CPDFSDK_Document* pDocument, /*CReader_DocView *pDocView,*/ const CPDF_Action& action); + void DoAction_GoTo(CPDFSDK_Document* pDocument, const CPDF_Action& action); void DoAction_GoToR(CPDFSDK_Document* pDocument, const CPDF_Action& action); void DoAction_Launch(CPDFSDK_Document* pDocument, const CPDF_Action& action); void DoAction_URI(CPDFSDK_Document* pDocument, const CPDF_Action& action); void DoAction_Named(CPDFSDK_Document* pDocument, const CPDF_Action& action); - void DoAction_SetOCGState(CPDFSDK_Document* pDocument, /*CReader_DocView* pDocView,*/ const CPDF_Action& action); + void DoAction_SetOCGState(CPDFSDK_Document* pDocument, const CPDF_Action& action); -private: - CPDFSDK_FormActionHandler* m_pFormActionHandler; - CPDFSDK_MediaActionHandler* m_pMediaActionHandler; + nonstd::unique_ptr m_pFormActionHandler; + CPDFSDK_MediaActionHandler* m_pMediaActionHandler; }; #endif // FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_ diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index ac0f72aef8..718ff60ab5 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -56,7 +56,7 @@ typedef struct _PDFSDK_FieldAction FX_BOOL bFieldFull; //in FX_BOOL bRC; //in[out] }PDFSDK_FieldAction; -class CPDFSDK_Widget:public CPDFSDK_Annot +class CPDFSDK_Widget : public CPDFSDK_Annot { public: CPDFSDK_Widget(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm); @@ -170,14 +170,12 @@ private: class CPDFSDK_InterForm : public CPDF_FormNotify { public: - CPDFSDK_InterForm(CPDFSDK_Document* pDocument); - virtual ~CPDFSDK_InterForm(); + explicit CPDFSDK_InterForm(CPDFSDK_Document* pDocument); + ~CPDFSDK_InterForm() override; -public: - virtual void Destroy(); - virtual CPDF_InterForm* GetInterForm(); + CPDF_InterForm* GetInterForm() const { return m_pInterForm; } + CPDFSDK_Document* GetDocument() const { return m_pDocument; } - CPDFSDK_Document* GetDocument(); FX_BOOL HighlightWidgets(); CPDFSDK_Widget* GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const; diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 48c6516d22..54731193dd 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -77,13 +77,7 @@ FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy) #define _T(x) x #endif -#ifdef API5 - CPDF_ModuleMgr* g_pModuleMgr = NULL; -#else - CCodec_ModuleMgr* g_pCodecModule = NULL; -#endif - -//extern CPDFSDK_FormFillApp* g_pFormFillApp; +CCodec_ModuleMgr* g_pCodecModule = nullptr; #if _FX_OS_ == _FX_LINUX_EMBEDDED_ class CFontMapper : public IPDF_FontMapper @@ -111,7 +105,7 @@ CFontMapper* g_pFontMapper = NULL; DLLEXPORT void STDCALL FPDF_InitLibrary() { - g_pCodecModule = CCodec_ModuleMgr::Create(); + g_pCodecModule = new CCodec_ModuleMgr(); CFX_GEModule::Create(); CFX_GEModule::Get()->SetCodecModule(g_pCodecModule); @@ -135,15 +129,13 @@ DLLEXPORT void STDCALL FPDF_DestroyLibrary() { #if _FX_OS_ == _FX_LINUX_EMBEDDED_ - if (g_pFontMapper) delete g_pFontMapper; + delete g_pFontMapper; + g_pFontMapper = nullptr; #endif -#ifdef API5 - g_pModuleMgr->Destroy(); -#else CPDF_ModuleMgr::Destroy(); CFX_GEModule::Destroy(); - g_pCodecModule->Destroy(); -#endif + delete g_pCodecModule; + g_pCodecModule = nullptr; } #ifndef _WIN32 diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp index b790585a6a..145559e057 100644 --- a/fpdfsdk/src/fsdk_actionhandler.cpp +++ b/fpdfsdk/src/fsdk_actionhandler.cpp @@ -11,27 +11,9 @@ /* -------------------------- CBA_ActionHandler -------------------------- */ -CPDFSDK_ActionHandler::CPDFSDK_ActionHandler(CPDFDoc_Environment* pEvi) : - m_pFormActionHandler(NULL), - m_pMediaActionHandler(NULL) -{ - m_pFormActionHandler = new CPDFSDK_FormActionHandler; -} - -CPDFSDK_ActionHandler::~CPDFSDK_ActionHandler() -{ - if(m_pFormActionHandler) - { - delete m_pFormActionHandler; - m_pFormActionHandler = NULL; - } -} - -void CPDFSDK_ActionHandler::SetFormActionHandler(CPDFSDK_FormActionHandler* pHandler) -{ - ASSERT(pHandler != NULL); - ASSERT(m_pFormActionHandler == NULL); - m_pFormActionHandler = pHandler; +CPDFSDK_ActionHandler::CPDFSDK_ActionHandler(CPDFDoc_Environment* pEvi) + : m_pFormActionHandler(new CPDFSDK_FormActionHandler), + m_pMediaActionHandler(NULL) { } void CPDFSDK_ActionHandler::SetMediaActionHandler(CPDFSDK_MediaActionHandler* pHandler) @@ -41,11 +23,6 @@ void CPDFSDK_ActionHandler::SetMediaActionHandler(CPDFSDK_MediaActionHandler* pH m_pMediaActionHandler = pHandler; } -void CPDFSDK_ActionHandler::Destroy() -{ - delete this; -} - //document open FX_BOOL CPDFSDK_ActionHandler::DoAction_DocOpen(const CPDF_Action& action, CPDFSDK_Document* pDocument) { diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index f58bfd84f2..312d323581 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1666,28 +1666,12 @@ CPDFSDK_InterForm::CPDFSDK_InterForm(CPDFSDK_Document* pDocument) CPDFSDK_InterForm::~CPDFSDK_InterForm() { - ASSERT(m_pInterForm != NULL); delete m_pInterForm; m_pInterForm = NULL; m_Map.RemoveAll(); } -void CPDFSDK_InterForm::Destroy() -{ - delete this; -} - -CPDF_InterForm* CPDFSDK_InterForm::GetInterForm() -{ - return m_pInterForm; -} - -CPDFSDK_Document* CPDFSDK_InterForm::GetDocument() -{ - return m_pDocument; -} - FX_BOOL CPDFSDK_InterForm::HighlightWidgets() { return FALSE; diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 1e57dc7b4e..b8028aad73 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -332,24 +332,20 @@ CPDFSDK_Document::CPDFSDK_Document(CPDF_Document* pDoc,CPDFDoc_Environment* pEnv CPDFSDK_Document::~CPDFSDK_Document() { - FX_POSITION pos = m_pageMap.GetStartPosition(); - while (pos) { - CPDF_Page* pPage = NULL; - CPDFSDK_PageView* pPageView = NULL; - m_pageMap.GetNextAssoc(pos, pPage, pPageView); - delete pPageView; - } - m_pageMap.RemoveAll(); - if(m_pInterForm) - { - m_pInterForm->Destroy(); - m_pInterForm = NULL; - } - if(m_pOccontent) - { - delete m_pOccontent; - m_pOccontent = NULL; - } + FX_POSITION pos = m_pageMap.GetStartPosition(); + while (pos) { + CPDF_Page* pPage = NULL; + CPDFSDK_PageView* pPageView = NULL; + m_pageMap.GetNextAssoc(pos, pPage, pPageView); + delete pPageView; + } + m_pageMap.RemoveAll(); + + delete m_pInterForm; + m_pInterForm = nullptr; + + delete m_pOccontent; + m_pOccontent = nullptr; } void CPDFSDK_Document::InitPageView() -- cgit v1.2.3