diff options
| author | Tom Sepez <tsepez@chromium.org> | 2020-01-29 21:27:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2020-01-29 21:27:44 +0000 |
| commit | 20d0809b7eba827e1b5a828a68670b7f8f53ce2e (patch) | |
| tree | b364915f1a8d5c7eee4163f0bea3737440c7b88d /fpdfsdk | |
| parent | 1bb1301a369d39de87fe3b702a945a6f0d3a0828 (diff) | |
| download | pdfium-20d0809b7eba827e1b5a828a68670b7f8f53ce2e.tar.gz | |
Remove class CPDF_DocJSActions.
It's just a nametree, and used only in one place, so put small
amout of code inline where it is used. Avoid re-creation
of the nametree on each iteration in the process.
-- rename one method.
Change-Id: Id2266af431df6d9aadc76cdc791f4368552a25a3
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65730
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.cpp | 14 | ||||
| -rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_formfill.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp index 5f3b7e1c6..021ec6005 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp +++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp @@ -12,7 +12,7 @@ #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" -#include "core/fpdfdoc/cpdf_docjsactions.h" +#include "core/fpdfdoc/cpdf_nametree.h" #include "core/fxcrt/fx_memory_wrappers.h" #include "fpdfsdk/cpdfsdk_actionhandler.h" #include "fpdfsdk/cpdfsdk_annothandlermgr.h" @@ -591,13 +591,13 @@ CPDFSDK_PageView* CPDFSDK_FormFillEnvironment::GetPageView(int nIndex) { return it != m_PageMap.end() ? it->second.get() : nullptr; } -void CPDFSDK_FormFillEnvironment::ProcJavascriptFun() { - CPDF_DocJSActions docJS(m_pCPDFDoc.Get()); - int iCount = docJS.CountJSActions(); +void CPDFSDK_FormFillEnvironment::ProcJavascriptAction() { + CPDF_NameTree docJS(m_pCPDFDoc.Get(), "JavaScript"); + int iCount = docJS.GetCount(); for (int i = 0; i < iCount; i++) { - WideString csJSName; - CPDF_Action jsAction = docJS.GetJSActionAndName(i, &csJSName); - GetActionHandler()->DoAction_JavaScript(jsAction, csJSName, this); + WideString name; + CPDF_Action action(ToDictionary(docJS.LookupValueAndName(i, &name))); + GetActionHandler()->DoAction_JavaScript(action, name, this); } } diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index 99f98e7c3..ea673947e 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -82,7 +82,7 @@ class CPDFSDK_FormFillEnvironment final : public Observable, void SetChangeMark() { m_bChangeMask = true; } void ClearChangeMark() { m_bChangeMask = false; } - void ProcJavascriptFun(); + void ProcJavascriptAction(); bool ProcOpenAction(); void Invalidate(IPDF_Page* page, const FX_RECT& rect); diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index 5f6433798..a3f3022b7 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp @@ -651,7 +651,7 @@ FORM_DoDocumentJSAction(FPDF_FORMHANDLE hHandle) { CPDFSDK_FormFillEnvironment* pFormFillEnv = CPDFSDKFormFillEnvironmentFromFPDFFormHandle(hHandle); if (pFormFillEnv && pFormFillEnv->IsJSPlatformPresent()) - pFormFillEnv->ProcJavascriptFun(); + pFormFillEnv->ProcJavascriptAction(); } FPDF_EXPORT void FPDF_CALLCONV |