From e3b2a4eca66e357df663a6f7464ef9af5e85883f Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 26 May 2016 12:39:34 -0700 Subject: Rename FXJSE_CLASS to avoid confusion with CFXJSE_CLASS BUG= Review-Url: https://codereview.chromium.org/2010013003 --- xfa/fxfa/parser/xfa_script_imp.cpp | 4 ++-- xfa/fxfa/parser/xfa_script_imp.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/parser') 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 m_mapXFAToValue; - FXJSE_CLASS m_JsGlobalVariablesClass; + FXJSE_CLASS_DESCRIPTOR m_JsGlobalVariablesClass; CFX_MapPtrTemplate m_mapVariableToContext; CXFA_EventParam m_eventParam; CXFA_NodeArray m_upObjectArray; -- cgit v1.2.3