From 7f2abcc015583e63cceb52acde757cb2111420bd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 26 May 2016 09:40:27 -0700 Subject: Replace FXJSE_HCONTEXT with CFXJSE_Context* This Cl removes FXJSE_HCONTEXT and replaces it with the concrete CFXJSE_Context. All varibles have been updated as well to match the new type. Review-Url: https://codereview.chromium.org/2013963005 --- xfa/fxfa/parser/xfa_script_imp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/parser/xfa_script_imp.h') diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h index 7a9f8ae3ff..2efd58914b 100644 --- a/xfa/fxfa/parser/xfa_script_imp.h +++ b/xfa/fxfa/parser/xfa_script_imp.h @@ -93,15 +93,15 @@ class CXFA_ScriptContext { CXFA_NodeArray& GetUpObjectArray() { return m_upObjectArray; } CXFA_Document* GetDocument() const { return m_pDocument; } - protected: + private: void DefineJsContext(); - FXJSE_HCONTEXT CreateVariablesContext(CXFA_Node* pScriptNode, - CXFA_Node* pSubform); + CFXJSE_Context* CreateVariablesContext(CXFA_Node* pScriptNode, + CXFA_Node* pSubform); void DefineJsClass(); - void RemoveBuiltInObjs(FXJSE_HCONTEXT jsContext) const; + void RemoveBuiltInObjs(CFXJSE_Context* pContext) const; CXFA_Document* m_pDocument; - FXJSE_HCONTEXT m_hJsContext; + CFXJSE_Context* m_pJsContext; v8::Isolate* m_pIsolate; FXJSE_HCLASS m_hJsClass; XFA_SCRIPTLANGTYPE m_eScriptType; @@ -109,7 +109,7 @@ class CXFA_ScriptContext { FXJSE_CLASS m_JsNormalClass; CFX_MapPtrTemplate m_mapXFAToHValue; FXJSE_CLASS m_JsGlobalVariablesClass; - CFX_MapPtrTemplate m_mapVariableToHValue; + CFX_MapPtrTemplate m_mapVariableToContext; CXFA_EventParam m_eventParam; CXFA_NodeArray m_upObjectArray; CFX_ArrayTemplate m_CacheListArray; -- cgit v1.2.3