From f4dc38bbc52501b322e1c39115f5ce4231773eab Mon Sep 17 00:00:00 2001 From: tonikitoo Date: Tue, 9 Aug 2016 17:07:54 -0700 Subject: The benefits of having a CPDFSDK_FormActionHandler instance in CPDFSDK_ActionHandler are unclear. It does not add encapsulation, nor simplicity to the logic. CL is a driven-by clean up that merges CPDFSDK_FormActionHandler into CPDFSDK_ActionHandler. It takes the opportunity to delete CPDFSDK_ActionHandler (now) empty constructor and destructor, in favor of compiler-generated ones. No behavior change is expected, so no new tests are being added. Review-Url: https://codereview.chromium.org/2227173002 --- fpdfsdk/include/fsdk_actionhandler.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/include/fsdk_actionhandler.h') diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index e8f1a0deb9..66ec69e06a 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -18,22 +18,8 @@ class CPDFSDK_Document; class CPDF_Bookmark; class CPDF_Dictionary; -class CPDFSDK_FormActionHandler { - public: - FX_BOOL DoAction_Hide(const CPDF_Action& action, CPDFSDK_Document* pDocument); - FX_BOOL DoAction_SubmitForm(const CPDF_Action& action, - CPDFSDK_Document* pDocument); - FX_BOOL DoAction_ResetForm(const CPDF_Action& action, - CPDFSDK_Document* pDocument); - FX_BOOL DoAction_ImportData(const CPDF_Action& action, - CPDFSDK_Document* pDocument); -}; - class CPDFSDK_ActionHandler { public: - CPDFSDK_ActionHandler(); - ~CPDFSDK_ActionHandler(); - FX_BOOL DoAction_DocOpen(const CPDF_Action& action, CPDFSDK_Document* pDocument); FX_BOOL DoAction_JavaScript(const CPDF_Action& JsAction, @@ -117,7 +103,13 @@ class CPDFSDK_ActionHandler { void DoAction_SetOCGState(CPDFSDK_Document* pDocument, const CPDF_Action& action); - std::unique_ptr m_pFormActionHandler; + FX_BOOL DoAction_Hide(const CPDF_Action& action, CPDFSDK_Document* pDocument); + FX_BOOL DoAction_SubmitForm(const CPDF_Action& action, + CPDFSDK_Document* pDocument); + FX_BOOL DoAction_ResetForm(const CPDF_Action& action, + CPDFSDK_Document* pDocument); + FX_BOOL DoAction_ImportData(const CPDF_Action& action, + CPDFSDK_Document* pDocument); }; #endif // FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_ -- cgit v1.2.3