From 2c28619de8051661c7f66f2192c6fb9ef14ee905 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 18 Jun 2015 12:47:11 -0700 Subject: Replace some Release() calls with virtual destructors. Required fixing xfa-specific code. Original Review URL: https://codereview.chromium.org/1192013002. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1176413004. --- fpdfsdk/src/fsdk_actionhandler.cpp | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'fpdfsdk/src/fsdk_actionhandler.cpp') diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp index dd176eebb0..485852ca00 100644 --- a/fpdfsdk/src/fsdk_actionhandler.cpp +++ b/fpdfsdk/src/fsdk_actionhandler.cpp @@ -12,27 +12,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) @@ -42,11 +24,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) { -- cgit v1.2.3