From 07c0a4952a9fe45e51c6ba5a2e19296e52ea6ec7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 14 Dec 2017 20:29:23 +0000 Subject: 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 Reviewed-by: Henrique Nakashima --- fxjs/cfxjse_engine.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fxjs/cfxjse_engine.h') diff --git a/fxjs/cfxjse_engine.h b/fxjs/cfxjse_engine.h index 9541f7b26b..777921dfc4 100644 --- a/fxjs/cfxjse_engine.h +++ b/fxjs/cfxjse_engine.h @@ -15,6 +15,7 @@ #include "fxjs/cjs_v8.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" +#include "xfa/fxfa/parser/cxfa_script.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" #define XFA_RESOLVENODE_TagName 0x0002 @@ -53,7 +54,7 @@ class CFXJSE_Engine : public CJS_V8 { void SetEventParam(CXFA_EventParam param) { m_eventParam = param; } CXFA_EventParam* GetEventParam() { return &m_eventParam; } - bool RunScript(CXFA_ScriptData::Type eScriptType, + bool RunScript(CXFA_Script::Type eScriptType, const WideStringView& wsScript, CFXJSE_Value* pRetValue, CXFA_Object* pThisObject); @@ -78,7 +79,7 @@ class CFXJSE_Engine : public CJS_V8 { void SetRunAtType(XFA_AttributeEnum eRunAt) { m_eRunAtType = eRunAt; } bool IsRunAtClient() { return m_eRunAtType != XFA_AttributeEnum::Server; } - CXFA_ScriptData::Type GetType(); + CXFA_Script::Type GetType(); std::vector* GetUpObjectArray() { return &m_upObjectArray; } CXFA_Document* GetDocument() const { return m_pDocument.Get(); } @@ -102,7 +103,7 @@ class CFXJSE_Engine : public CJS_V8 { UnownedPtr const m_pDocument; std::unique_ptr m_JsContext; CFXJSE_Class* m_pJsClass; - CXFA_ScriptData::Type m_eScriptType; + CXFA_Script::Type m_eScriptType; std::map> m_mapObjectToValue; std::map> m_mapVariableToContext; -- cgit v1.2.3