summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_ffwidgethandler.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-12-14 20:29:23 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-12-14 20:29:23 +0000
commit07c0a4952a9fe45e51c6ba5a2e19296e52ea6ec7 (patch)
tree818bfc4ae4832250add9f92037994832f22b8e89 /xfa/fxfa/cxfa_ffwidgethandler.cpp
parentc5e0f66f5f2e0645f2beab70b44690fe510a9f2d (diff)
downloadpdfium-07c0a4952a9fe45e51c6ba5a2e19296e52ea6ec7.tar.xz
Fold CXFA_ScriptData into CXFA_Script
This CL removes the CXFA_ScriptData wrapper and uses CXFA_Script directly. Change-Id: I1f1932ef96ee4a24407de7eb1d68b8631a5a67ea Reviewed-on: https://pdfium-review.googlesource.com/21173 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffwidgethandler.cpp')
-rw-r--r--xfa/fxfa/cxfa_ffwidgethandler.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 39919bc1e7..685e92d61a 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -191,11 +191,11 @@ bool CXFA_FFWidgetHandler::HasEvent(CXFA_WidgetAcc* pWidgetAcc,
switch (eEventType) {
case XFA_EVENT_Calculate: {
CXFA_CalculateData calcData = pWidgetAcc->GetCalculateData();
- return calcData.HasValidNode() && calcData.GetScriptData().HasValidNode();
+ return calcData.HasValidNode() && calcData.GetScript();
}
case XFA_EVENT_Validate: {
CXFA_Validate* validate = pWidgetAcc->GetValidate(false);
- return validate && validate->GetScriptData().HasValidNode();
+ return validate && validate->GetScript();
}
default:
break;
@@ -226,9 +226,7 @@ int32_t CXFA_FFWidgetHandler::ProcessEvent(CXFA_WidgetAcc* pWidgetAcc,
return XFA_EVENTERROR_NotExist;
if (pWidgetAcc->GetNode()->IsUserInteractive())
return XFA_EVENTERROR_Disabled;
-
- CXFA_ScriptData script = calcData.GetScriptData();
- return pWidgetAcc->ExecuteScript(script, pParam);
+ return pWidgetAcc->ExecuteScript(calcData.GetScript(), pParam);
}
default:
break;