summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/fm2js/xfa_fm2jscontext.cpp6
-rw-r--r--xfa/fxfa/fm2js/xfa_fm2jscontext.h2
-rw-r--r--xfa/fxfa/parser/xfa_script_imp.cpp10
-rw-r--r--xfa/fxfa/parser/xfa_script_imp.h4
4 files changed, 11 insertions, 11 deletions
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index f875ad2713..add3e8ab3f 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -7164,7 +7164,7 @@ static FXJSE_FUNCTION formcalc_fm2js_functions[] = {
{"fm_var_filter", CXFA_FM2JSContext::fm_var_filter},
};
CXFA_FM2JSContext::CXFA_FM2JSContext()
- : m_hFMClass(nullptr), m_pDocument(nullptr) {
+ : m_pFMClass(nullptr), m_pDocument(nullptr) {
FXSYS_memset(&m_fmClass, 0, sizeof(FXJSE_CLASS));
}
CXFA_FM2JSContext::~CXFA_FM2JSContext() {
@@ -7187,10 +7187,10 @@ void CXFA_FM2JSContext::Initialize(v8::Isolate* pScriptIsolate,
m_fmClass.propNum = 0;
m_fmClass.methNum =
sizeof(formcalc_fm2js_functions) / sizeof(formcalc_fm2js_functions[0]);
- m_hFMClass = FXJSE_DefineClass(pScriptContext, &m_fmClass);
+ m_pFMClass = FXJSE_DefineClass(pScriptContext, &m_fmClass);
m_hValue = FXJSE_Value_Create(pScriptIsolate);
FXJSE_Value_SetNull(m_hValue);
- FXJSE_Value_SetObject(m_hValue, this, m_hFMClass);
+ FXJSE_Value_SetObject(m_hValue, this, m_pFMClass);
}
void CXFA_FM2JSContext::GlobalPropertyGetter(FXJSE_HVALUE hValue) {
FXJSE_Value_Set(hValue, m_hValue);
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
index 997b32fe59..81cf08b2a5 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h
@@ -447,7 +447,7 @@ class CXFA_FM2JSContext {
private:
v8::Isolate* m_pIsolate;
FXJSE_CLASS m_fmClass;
- FXJSE_HCLASS m_hFMClass;
+ CFXJSE_Class* m_pFMClass;
FXJSE_HVALUE m_hValue;
CXFA_Document* m_pDocument;
};
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index c29e7a88d0..c55a66cf9a 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -24,7 +24,7 @@ CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument)
: m_pDocument(pDocument),
m_pJsContext(nullptr),
m_pIsolate(nullptr),
- m_hJsClass(nullptr),
+ m_pJsClass(nullptr),
m_eScriptType(XFA_SCRIPTLANGTYPE_Unkown),
m_pScriptNodeArray(nullptr),
m_pResolveProcessor(nullptr),
@@ -532,7 +532,7 @@ void CXFA_ScriptContext::DefineJsClass() {
m_JsNormalClass.dynPropTypeGetter = CXFA_ScriptContext::NormalPropTypeGetter;
m_JsNormalClass.dynPropDeleter = NULL;
m_JsNormalClass.dynMethodCall = CXFA_ScriptContext::NormalMethodCall;
- m_hJsClass = FXJSE_DefineClass(m_pJsContext, &m_JsNormalClass);
+ m_pJsClass = FXJSE_DefineClass(m_pJsContext, &m_JsNormalClass);
}
void CXFA_ScriptContext::RemoveBuiltInObjs(CFXJSE_Context* pContext) const {
static const CFX_ByteStringC OBJ_NAME[2] = {"Number", "Date"};
@@ -545,8 +545,8 @@ void CXFA_ScriptContext::RemoveBuiltInObjs(CFXJSE_Context* pContext) const {
FXJSE_Value_Release(hProp);
FXJSE_Value_Release(hObject);
}
-FXJSE_HCLASS CXFA_ScriptContext::GetJseNormalClass() {
- return m_hJsClass;
+CFXJSE_Class* CXFA_ScriptContext::GetJseNormalClass() {
+ return m_pJsClass;
}
int32_t CXFA_ScriptContext::ResolveObjects(CXFA_Object* refNode,
const CFX_WideStringC& wsExpression,
@@ -722,7 +722,7 @@ FXJSE_HVALUE CXFA_ScriptContext::GetJSValueFromMap(CXFA_Object* pObject) {
void* pValue = m_mapXFAToHValue.GetValueAt(pObject);
if (pValue == NULL) {
FXJSE_HVALUE jsHvalue = FXJSE_Value_Create(m_pIsolate);
- FXJSE_Value_SetObject(jsHvalue, pObject, m_hJsClass);
+ FXJSE_Value_SetObject(jsHvalue, pObject, m_pJsClass);
m_mapXFAToHValue.SetAt(pObject, jsHvalue);
pValue = jsHvalue;
}
diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h
index 2efd58914b..5d1269b767 100644
--- a/xfa/fxfa/parser/xfa_script_imp.h
+++ b/xfa/fxfa/parser/xfa_script_imp.h
@@ -48,7 +48,7 @@ class CXFA_ScriptContext {
void SetNodesOfRunScript(CXFA_NodeArray* pArray);
void AddNodesOfRunScript(const CXFA_NodeArray& nodes);
void AddNodesOfRunScript(CXFA_Node* pNode);
- FXJSE_HCLASS GetJseNormalClass();
+ CFXJSE_Class* GetJseNormalClass();
void SetRunAtType(XFA_ATTRIBUTEENUM eRunAt) { m_eRunAtType = eRunAt; }
FX_BOOL IsRunAtClient() { return m_eRunAtType != XFA_ATTRIBUTEENUM_Server; }
@@ -103,7 +103,7 @@ class CXFA_ScriptContext {
CXFA_Document* m_pDocument;
CFXJSE_Context* m_pJsContext;
v8::Isolate* m_pIsolate;
- FXJSE_HCLASS m_hJsClass;
+ CFXJSE_Class* m_pJsClass;
XFA_SCRIPTLANGTYPE m_eScriptType;
FXJSE_CLASS m_JsGlobalClass;
FXJSE_CLASS m_JsNormalClass;