diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 16:38:51 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 16:38:51 -0700 |
| commit | ff8347a4b16f000be628c5e10d03a1e1c17537eb (patch) | |
| tree | 1d46e77a1ef6b28def6af3ffdd576017a6cfe229 /fpdfsdk/src/fsdk_actionhandler.cpp | |
| parent | c4d9f6ad2dc922b574862cd2f6f0a899d7e169e3 (diff) | |
| download | pdfium-ff8347a4b16f000be628c5e10d03a1e1c17537eb.tar.xz | |
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.
Diffstat (limited to 'fpdfsdk/src/fsdk_actionhandler.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_actionhandler.cpp | 29 |
1 files changed, 3 insertions, 26 deletions
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) { |