summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-05-26 12:39:34 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-26 12:39:34 -0700
commite3b2a4eca66e357df663a6f7464ef9af5e85883f (patch)
treeb4d591b227e69f9652605fa941611c651e8d6fa4 /xfa/fxfa/parser
parent60607c3baaf52574cab748a97c213e447c9108c0 (diff)
downloadpdfium-e3b2a4eca66e357df663a6f7464ef9af5e85883f.tar.xz
Rename FXJSE_CLASS to avoid confusion with CFXJSE_CLASS
BUG= Review-Url: https://codereview.chromium.org/2010013003
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/xfa_script_imp.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_script_imp.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index 743719ca55..7a0d6ff20f 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -33,8 +33,8 @@ CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument)
m_pThisObject(nullptr),
m_dwBuiltInInFlags(0),
m_eRunAtType(XFA_ATTRIBUTEENUM_Client) {
- FXSYS_memset(&m_JsGlobalClass, 0, sizeof(FXJSE_CLASS));
- FXSYS_memset(&m_JsNormalClass, 0, sizeof(FXJSE_CLASS));
+ FXSYS_memset(&m_JsGlobalClass, 0, sizeof(FXJSE_CLASS_DESCRIPTOR));
+ FXSYS_memset(&m_JsNormalClass, 0, sizeof(FXJSE_CLASS_DESCRIPTOR));
}
CXFA_ScriptContext::~CXFA_ScriptContext() {
FX_POSITION ps = m_mapXFAToValue.GetStartPosition();
diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h
index 1060911e88..e69f8c1e70 100644
--- a/xfa/fxfa/parser/xfa_script_imp.h
+++ b/xfa/fxfa/parser/xfa_script_imp.h
@@ -105,10 +105,10 @@ class CXFA_ScriptContext {
v8::Isolate* m_pIsolate;
CFXJSE_Class* m_pJsClass;
XFA_SCRIPTLANGTYPE m_eScriptType;
- FXJSE_CLASS m_JsGlobalClass;
- FXJSE_CLASS m_JsNormalClass;
+ FXJSE_CLASS_DESCRIPTOR m_JsGlobalClass;
+ FXJSE_CLASS_DESCRIPTOR m_JsNormalClass;
CFX_MapPtrTemplate<CXFA_Object*, CFXJSE_Value*> m_mapXFAToValue;
- FXJSE_CLASS m_JsGlobalVariablesClass;
+ FXJSE_CLASS_DESCRIPTOR m_JsGlobalVariablesClass;
CFX_MapPtrTemplate<CXFA_Object*, CFXJSE_Context*> m_mapVariableToContext;
CXFA_EventParam m_eventParam;
CXFA_NodeArray m_upObjectArray;