4 files changed, 15 insertions, 15 deletions
diff --git a/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp b/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
index a5992a9709..df817606e2 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jsapi.cpp
@@ -44,12 +44,12 @@ XFA_HFM2JSCONTEXT XFA_FM2JS_ContextCreate() {
 }
 
 void XFA_FM2JS_ContextInitialize(XFA_HFM2JSCONTEXT hFM2JSContext,
-                                 v8::Isolate* pScriptRuntime,
-                                 FXJSE_HCONTEXT hScriptContext,
+                                 v8::Isolate* pScriptIsolate,
+                                 CFXJSE_Context* pScriptContext,
                                  CXFA_Document* pDocument) {
   CXFA_FM2JSContext* pContext =
       reinterpret_cast<CXFA_FM2JSContext*>(hFM2JSContext);
-  pContext->Initialize(pScriptRuntime, hScriptContext, pDocument);
+  pContext->Initialize(pScriptIsolate, pScriptContext, pDocument);
 }
 
 void XFA_FM2JS_GlobalPropertyGetter(XFA_HFM2JSCONTEXT hFM2JSContext,
diff --git a/xfa/fxfa/fm2js/xfa_fm2jsapi.h b/xfa/fxfa/fm2js/xfa_fm2jsapi.h
index 4b0045accf..011ae76ac6 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jsapi.h
+++ b/xfa/fxfa/fm2js/xfa_fm2jsapi.h
@@ -23,8 +23,8 @@ int32_t XFA_FM2JS_Translate(const CFX_WideStringC& wsFormcalc,
                             CFX_WideString& wsError);
 XFA_HFM2JSCONTEXT XFA_FM2JS_ContextCreate();
 void XFA_FM2JS_ContextInitialize(XFA_HFM2JSCONTEXT hFM2JSContext,
-                                 v8::Isolate* pScriptRuntime,
-                                 FXJSE_HCONTEXT hScriptContext,
+                                 v8::Isolate* pScriptIsolate,
+                                 CFXJSE_Context* pScriptContext,
                                  CXFA_Document* pDocument);
 void XFA_FM2JS_GlobalPropertyGetter(XFA_HFM2JSCONTEXT hFM2JSContext,
                                     FXJSE_HVALUE hValue);
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index 7f0514eca0..f875ad2713 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -3239,16 +3239,16 @@ void CXFA_FM2JSContext::Eval(FXJSE_HOBJECT hThis,
       XFA_FM2JS_Translate(
           CFX_WideString::FromUTF8(utf8ScriptString.AsStringC()).AsStringC(),
           wsJavaScriptBuf, wsError);
-      FXJSE_HCONTEXT hContext = FXJSE_Context_Create(pIsolate);
+      CFXJSE_Context* pContext = FXJSE_Context_Create(pIsolate);
       FXJSE_HVALUE returnValue = FXJSE_Value_Create(pIsolate);
       javaScript = wsJavaScriptBuf.AsStringC();
       FXJSE_ExecuteScript(
-          hContext,
+          pContext,
           FX_UTF8Encode(javaScript.c_str(), javaScript.GetLength()).c_str(),
           returnValue);
       FXJSE_Value_Set(args.GetReturnValue(), returnValue);
       FXJSE_Value_Release(returnValue);
-      FXJSE_Context_Release(hContext);
+      FXJSE_Context_Release(pContext);
     }
     FXJSE_Value_Release(scriptValue);
   } else {
@@ -7175,11 +7175,11 @@ CXFA_FM2JSContext::~CXFA_FM2JSContext() {
   }
   m_pIsolate = NULL;
 }
-void CXFA_FM2JSContext::Initialize(v8::Isolate* hScriptRuntime,
-                                   FXJSE_HCONTEXT hScriptContext,
+void CXFA_FM2JSContext::Initialize(v8::Isolate* pScriptIsolate,
+                                   CFXJSE_Context* pScriptContext,
                                    CXFA_Document* pDoc) {
   m_pDocument = pDoc;
-  m_pIsolate = hScriptRuntime;
+  m_pIsolate = pScriptIsolate;
   m_fmClass.name = "XFA_FM2JS_FormCalcClass";
   m_fmClass.constructor = NULL;
   m_fmClass.properties = NULL;
@@ -7187,8 +7187,8 @@ void CXFA_FM2JSContext::Initialize(v8::Isolate* hScriptRuntime,
   m_fmClass.propNum = 0;
   m_fmClass.methNum =
       sizeof(formcalc_fm2js_functions) / sizeof(formcalc_fm2js_functions[0]);
-  m_hFMClass = FXJSE_DefineClass(hScriptContext, &m_fmClass);
-  m_hValue = FXJSE_Value_Create(hScriptRuntime);
+  m_hFMClass = FXJSE_DefineClass(pScriptContext, &m_fmClass);
+  m_hValue = FXJSE_Value_Create(pScriptIsolate);
   FXJSE_Value_SetNull(m_hValue);
   FXJSE_Value_SetObject(m_hValue, this, m_hFMClass);
 }
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
index 3cd4a0b763..997b32fe59 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
@@ -435,8 +435,8 @@ class CXFA_FM2JSContext {
   CXFA_FM2JSContext();
   ~CXFA_FM2JSContext();
 
-  void Initialize(v8::Isolate* pScriptRuntime,
-                  FXJSE_HCONTEXT hScriptContext,
+  void Initialize(v8::Isolate* pScriptIsolate,
+                  CFXJSE_Context* pScriptContext,
                   CXFA_Document* pDoc);
   void GlobalPropertyGetter(FXJSE_HVALUE hValue);