diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-14 20:29:23 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-14 20:29:23 +0000 |
| commit | 07c0a4952a9fe45e51c6ba5a2e19296e52ea6ec7 (patch) | |
| tree | 818bfc4ae4832250add9f92037994832f22b8e89 /xfa/fxfa/cxfa_fffield.cpp | |
| parent | c5e0f66f5f2e0645f2beab70b44690fe510a9f2d (diff) | |
| download | pdfium-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_fffield.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_fffield.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index e377fe1d2d..2b4748771e 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -23,6 +23,7 @@ #include "xfa/fxfa/cxfa_fwltheme.h" #include "xfa/fxfa/cxfa_textlayout.h" #include "xfa/fxfa/parser/cxfa_node.h" +#include "xfa/fxfa/parser/cxfa_script.h" #include "xfa/fxgraphics/cxfa_gecolor.h" #include "xfa/fxgraphics/cxfa_gepath.h" @@ -680,10 +681,10 @@ int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) { } case XFA_AttributeEnum::Warning: { if (version <= XFA_VERSION_204) { - CXFA_ScriptData scriptData = calcData.GetScriptData(); - if (!scriptData.HasValidNode()) + CXFA_Script* script = calcData.GetScript(); + if (!script) return 1; - if (scriptData.GetExpression().IsEmpty()) + if (script->GetExpression().IsEmpty()) return 1; } |