summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-09-01 14:06:55 -0700
committerTom Sepez <tsepez@chromium.org>2015-09-01 14:06:55 -0700
commit3b5f124fb6e0995c2f3a98433083ae02239b3115 (patch)
tree0725fa7318a3554398fb302b0a46c50207bda473 /fpdfsdk/src
parent9ed941a3709dc27ab8c7b27941197c6238f201a3 (diff)
downloadpdfium-3b5f124fb6e0995c2f3a98433083ae02239b3115.tar.xz
Merge to XFA: CPDFSDK_MediaActionHandler is unused.
(cherry picked from commit 23213b2750e33dfe96b091b78ec8b10fe4d73a67) Original Review URL: https://codereview.chromium.org/1329583004 . R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1325823006 .
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fsdk_actionhandler.cpp42
-rw-r--r--fpdfsdk/src/fsdk_mgr.cpp2
2 files changed, 3 insertions, 41 deletions
diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp
index 89b93eff01..c2e26f7501 100644
--- a/fpdfsdk/src/fsdk_actionhandler.cpp
+++ b/fpdfsdk/src/fsdk_actionhandler.cpp
@@ -10,27 +10,16 @@
#include "../include/fsdk_actionhandler.h"
#include "../include/javascript/IJavaScript.h"
-/* -------------------------- CBA_ActionHandler -------------------------- */
-
-CPDFSDK_ActionHandler::CPDFSDK_ActionHandler(CPDFDoc_Environment* pEvi)
- : m_pFormActionHandler(new CPDFSDK_FormActionHandler),
- m_pMediaActionHandler(NULL) {}
-
-void CPDFSDK_ActionHandler::SetMediaActionHandler(
- CPDFSDK_MediaActionHandler* pHandler) {
- ASSERT(pHandler != NULL);
- ASSERT(m_pMediaActionHandler == NULL);
- m_pMediaActionHandler = pHandler;
+CPDFSDK_ActionHandler::CPDFSDK_ActionHandler()
+ : m_pFormActionHandler(new CPDFSDK_FormActionHandler) {
}
-// document open
FX_BOOL CPDFSDK_ActionHandler::DoAction_DocOpen(const CPDF_Action& action,
CPDFSDK_Document* pDocument) {
CFX_PtrList list;
return ExecuteDocumentOpenAction(action, pDocument, list);
}
-// document open
FX_BOOL CPDFSDK_ActionHandler::DoAction_JavaScript(
const CPDF_Action& JsAction,
CFX_WideString csJSName,
@@ -454,14 +443,8 @@ void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action,
DoAction_URI(pDocument, action);
break;
case CPDF_Action::Sound:
- if (m_pMediaActionHandler) {
- m_pMediaActionHandler->DoAction_Sound(action, pDocument);
- }
break;
case CPDF_Action::Movie:
- if (m_pMediaActionHandler) {
- m_pMediaActionHandler->DoAction_Movie(action, pDocument);
- }
break;
case CPDF_Action::Hide:
if (m_pFormActionHandler) {
@@ -493,9 +476,6 @@ void CPDFSDK_ActionHandler::DoAction_NoJs(const CPDF_Action& action,
DoAction_SetOCGState(pDocument, action);
break;
case CPDF_Action::Rendition:
- if (m_pMediaActionHandler) {
- m_pMediaActionHandler->DoAction_Rendition(action, pDocument);
- }
break;
case CPDF_Action::Trans:
break;
@@ -767,21 +747,3 @@ FX_BOOL CPDFSDK_FormActionHandler::DoAction_ImportData(
return FALSE;
}
-
-FX_BOOL CPDFSDK_MediaActionHandler::DoAction_Rendition(
- const CPDF_Action& action,
- CPDFSDK_Document* pDocument) {
- return FALSE;
-}
-
-FX_BOOL CPDFSDK_MediaActionHandler::DoAction_Sound(
- const CPDF_Action& action,
- CPDFSDK_Document* pDocument) {
- return FALSE;
-}
-
-FX_BOOL CPDFSDK_MediaActionHandler::DoAction_Movie(
- const CPDF_Action& action,
- CPDFSDK_Document* pDocument) {
- return FALSE;
-}
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index bdffb8f6d8..4d3d01f6f4 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -399,7 +399,7 @@ CPDFSDK_AnnotHandlerMgr* CPDFDoc_Environment::GetAnnotHandlerMgr() {
CPDFSDK_ActionHandler* CPDFDoc_Environment::GetActionHander() {
if (!m_pActionHandler)
- m_pActionHandler = new CPDFSDK_ActionHandler(this);
+ m_pActionHandler = new CPDFSDK_ActionHandler();
return m_pActionHandler;
}