Remove FXJSE_Value_ToObject and call methods directly
This Cl removes the global FXJSE_Value_ToObject method and adds individual
methods on CXFA_Value to do the needed conversions.
Review-Url: https://codereview.chromium.org/2026993003
diff --git a/BUILD.gn b/BUILD.gn
index c85af4a..5d25890 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1487,6 +1487,8 @@
"xfa/fxfa/parser/cxfa_validate.h",
"xfa/fxfa/parser/cxfa_value.cpp",
"xfa/fxfa/parser/cxfa_value.h",
+ "xfa/fxfa/parser/cxfa_valuearray.cpp",
+ "xfa/fxfa/parser/cxfa_valuearray.h",
"xfa/fxfa/parser/cxfa_widgetdata.cpp",
"xfa/fxfa/parser/cxfa_widgetdata.h",
"xfa/fxfa/parser/xfa_basic_data.cpp",
diff --git a/xfa.gyp b/xfa.gyp
index 8926c31..0a63ed3 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -622,6 +622,8 @@
"xfa/fxfa/parser/cxfa_validate.h",
"xfa/fxfa/parser/cxfa_value.cpp",
"xfa/fxfa/parser/cxfa_value.h",
+ "xfa/fxfa/parser/cxfa_valuearray.cpp",
+ "xfa/fxfa/parser/cxfa_valuearray.h",
"xfa/fxfa/parser/cxfa_widgetdata.cpp",
"xfa/fxfa/parser/cxfa_widgetdata.h",
"xfa/fxfa/parser/xfa_basic_data.cpp",
diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp
index e65dd91..38e872a 100644
--- a/xfa/fxfa/app/xfa_ffdochandler.cpp
+++ b/xfa/fxfa/app/xfa_ffdochandler.cpp
@@ -56,7 +56,5 @@
return pScriptContext->RunScript(
(XFA_SCRIPTLANGTYPE)eScriptType, wsScript, pRetValue,
- pThisValue
- ? static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pThisValue, nullptr))
- : nullptr);
+ pThisValue ? CXFA_ScriptContext::ToObject(pThisValue, nullptr) : nullptr);
}
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index a9b296e..7841c95 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -494,6 +494,10 @@
return false;
}
+CXFA_FM2JSContext* ToJSContext(CFXJSE_Value* pValue, CFXJSE_Class* pClass) {
+ return static_cast<CXFA_FM2JSContext*>(pValue->ToHostObject(pClass));
+}
+
} // namespace
// static
@@ -501,9 +505,8 @@
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
if (args.GetLength() != 1) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Abs");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Abs");
return;
}
@@ -530,9 +533,7 @@
return;
}
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
uint32_t uCount = 0;
FX_DOUBLE dSum = 0.0;
for (int32_t i = 0; i < argc; i++) {
@@ -601,9 +602,8 @@
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
if (args.GetLength() != 1) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Ceil");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Ceil");
return;
}
@@ -621,8 +621,7 @@
void CXFA_FM2JSContext::Count(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
int32_t iCount = 0;
for (int32_t i = 0; i < args.GetLength(); i++) {
@@ -684,9 +683,8 @@
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
if (args.GetLength() != 1) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Floor");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Floor");
return;
}
@@ -704,8 +702,7 @@
void CXFA_FM2JSContext::Max(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
uint32_t uCount = 0;
FX_DOUBLE dMaxValue = 0.0;
@@ -786,8 +783,7 @@
void CXFA_FM2JSContext::Min(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
uint32_t uCount = 0;
FX_DOUBLE dMinValue = 0.0;
@@ -868,8 +864,7 @@
void CXFA_FM2JSContext::Mod(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() != 2) {
pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Mod");
return;
@@ -904,8 +899,7 @@
void CXFA_FM2JSContext::Round(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
int32_t argc = args.GetLength();
if (argc != 1 && argc != 2) {
pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Round");
@@ -960,8 +954,7 @@
return;
}
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
uint32_t uCount = 0;
FX_DOUBLE dSum = 0.0;
@@ -1038,9 +1031,8 @@
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
if (args.GetLength() != 0) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Date");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Date");
return;
}
@@ -1066,9 +1058,8 @@
CFXJSE_Arguments& args) {
int32_t argc = args.GetLength();
if (argc <= 0 || argc >= 4) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Date2Num");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Date2Num");
return;
}
@@ -1118,9 +1109,8 @@
CFXJSE_Arguments& args) {
int32_t argc = args.GetLength();
if (argc >= 3) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Date2Num");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Date2Num");
return;
}
@@ -1157,10 +1147,8 @@
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
if (args.GetLength() != 1) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
- L"IsoDate2Num");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"IsoDate2Num");
return;
}
@@ -1180,8 +1168,7 @@
void CXFA_FM2JSContext::IsoTime2Num(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() != 1) {
pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
L"IsoTime2Num");
@@ -1274,10 +1261,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
- L"LocalDateFmt");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"LocalDateFmt");
}
}
@@ -1319,10 +1304,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
- L"LocalTimeFmt");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"LocalTimeFmt");
}
}
@@ -1468,9 +1451,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Num2Date");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Num2Date");
}
}
@@ -1523,9 +1505,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Num2GMTime");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Num2GMTime");
}
}
@@ -1578,9 +1559,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Num2Time");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Num2Time");
}
}
@@ -1598,9 +1578,8 @@
FXJSE_Value_SetInteger(args.GetReturnValue(),
((iGMHour * 3600 + iGMMin * 60 + iGMSec) * 1000));
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Time");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Time");
}
}
@@ -1638,9 +1617,7 @@
}
}
if (!bFlags) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
IFX_Locale* pLocale = nullptr;
if (localString.IsEmpty()) {
@@ -1695,9 +1672,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Time2Num");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Time2Num");
}
}
@@ -1739,9 +1715,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"TimeFmt");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"TimeFmt");
}
}
@@ -2076,9 +2051,7 @@
const CFX_ByteStringC& szFormat,
const CFX_ByteStringC& szLocale,
CFX_ByteString& strIsoDate) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return FALSE;
}
@@ -2114,9 +2087,7 @@
const CFX_ByteStringC& szFormat,
const CFX_ByteStringC& szLocale,
CFX_ByteString& strIsoTime) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return FALSE;
}
@@ -2155,9 +2126,7 @@
const CFX_ByteStringC& szFormat,
const CFX_ByteStringC& szLocale,
CFX_ByteString& strLocalDate) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return FALSE;
}
@@ -2195,9 +2164,7 @@
const CFX_ByteStringC& szFormat,
const CFX_ByteStringC& szLocale,
CFX_ByteString& strLocalTime) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return FALSE;
}
@@ -2237,9 +2204,7 @@
const CFX_ByteStringC& szFormat,
const CFX_ByteStringC& szLocale,
CFX_ByteString& strGMTTime) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return FALSE;
}
@@ -2374,9 +2339,7 @@
strStyle = FX_LOCALEDATETIMESUBCATEGORY_Medium;
break;
}
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return;
}
@@ -2430,9 +2393,7 @@
strStyle = FX_LOCALEDATETIMESUBCATEGORY_Medium;
break;
}
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return;
}
@@ -2535,8 +2496,7 @@
void CXFA_FM2JSContext::Apr(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_DOUBLE nPrincipal = 0;
@@ -2599,8 +2559,7 @@
void CXFA_FM2JSContext::CTerm(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_FLOAT nRate = 0;
@@ -2636,8 +2595,7 @@
void CXFA_FM2JSContext::FV(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_DOUBLE nAmount = 0;
@@ -2681,8 +2639,7 @@
void CXFA_FM2JSContext::IPmt(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 5) {
FX_BOOL bFlags = FALSE;
FX_FLOAT nPrincpalAmount = 0;
@@ -2752,8 +2709,7 @@
void CXFA_FM2JSContext::NPV(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
int32_t argc = args.GetLength();
if (argc > 2) {
FX_BOOL bFlags = FALSE;
@@ -2800,8 +2756,7 @@
void CXFA_FM2JSContext::Pmt(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_FLOAT nPrincipal = 0;
@@ -2842,8 +2797,7 @@
void CXFA_FM2JSContext::PPmt(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 5) {
FX_BOOL bFlags = FALSE;
FX_FLOAT nPrincpalAmount = 0;
@@ -2914,8 +2868,7 @@
void CXFA_FM2JSContext::PV(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_DOUBLE nAmount = 0;
@@ -2955,8 +2908,7 @@
void CXFA_FM2JSContext::Rate(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_FLOAT nFuture = 0;
@@ -2993,8 +2945,7 @@
void CXFA_FM2JSContext::Term(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 3) {
FX_BOOL bFlags = FALSE;
FX_FLOAT nMount = 0;
@@ -3031,8 +2982,7 @@
void CXFA_FM2JSContext::Choose(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
int32_t argc = args.GetLength();
if (argc > 1) {
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
@@ -3108,8 +3058,6 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Choose");
}
}
@@ -3123,9 +3071,8 @@
FXJSE_Value_SetInteger(args.GetReturnValue(),
FXJSE_Value_IsObject(argOne.get()));
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Exists");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Exists");
}
}
@@ -3147,9 +3094,8 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), FALSE);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"HasValue");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"HasValue");
}
}
@@ -3175,9 +3121,8 @@
}
FX_Free(parametersValue);
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Oneof");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Oneof");
}
}
@@ -3213,9 +3158,8 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Within");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Within");
}
}
@@ -3233,9 +3177,8 @@
FXJSE_Value_Set(args.GetReturnValue(),
bCondition ? argFirstValue.get() : argSecondValue.get());
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"If");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"If");
}
}
@@ -3243,8 +3186,7 @@
void CXFA_FM2JSContext::Eval(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 1) {
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
std::unique_ptr<CFXJSE_Value> scriptValue = GetSimpleValue(pThis, args, 0);
@@ -3279,8 +3221,7 @@
void CXFA_FM2JSContext::Ref(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
if (args.GetLength() == 1) {
std::unique_ptr<CFXJSE_Value> argOne = args.GetValue(0);
@@ -3459,9 +3400,8 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"UnitType");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"UnitType");
}
}
@@ -3616,9 +3556,8 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"UnitValue");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"UnitValue");
}
}
@@ -3644,9 +3583,8 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"At");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"At");
}
}
@@ -3676,9 +3614,8 @@
resultString.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Concat");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Concat");
}
}
@@ -3719,9 +3656,8 @@
FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Decode");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Decode");
}
}
@@ -3994,9 +3930,8 @@
FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultBuf.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Encode");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Encode");
}
}
@@ -4296,8 +4231,7 @@
void CXFA_FM2JSContext::Format(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() >= 2) {
std::unique_ptr<CFXJSE_Value> argOne = GetSimpleValue(pThis, args, 0);
std::unique_ptr<CFXJSE_Value> argTwo = GetSimpleValue(pThis, args, 1);
@@ -4401,9 +4335,8 @@
sourceString.Left(count).AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Left");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Left");
}
}
@@ -4421,9 +4354,8 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), sourceString.GetLength());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Len");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Len");
}
}
@@ -4465,9 +4397,8 @@
.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Lower");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Lower");
}
}
@@ -4487,9 +4418,8 @@
sourceString.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Ltrim");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Ltrim");
}
}
@@ -4497,8 +4427,7 @@
void CXFA_FM2JSContext::Parse(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 2) {
std::unique_ptr<CFXJSE_Value> argOne = GetSimpleValue(pThis, args, 0);
std::unique_ptr<CFXJSE_Value> argTwo = GetSimpleValue(pThis, args, 1);
@@ -4688,9 +4617,8 @@
resultString.AppendChar(0);
FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultString.AsStringC());
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Replace");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Replace");
}
}
@@ -4719,9 +4647,8 @@
sourceString.Right(count).AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Right");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Right");
}
}
@@ -4741,9 +4668,8 @@
sourceString.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Rtrim");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Rtrim");
}
}
@@ -4769,9 +4695,8 @@
FXJSE_Value_SetUTF8String(args.GetReturnValue(), spaceString.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Space");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Space");
}
}
@@ -4888,9 +4813,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Str");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Str");
}
}
@@ -4946,9 +4870,8 @@
resultString.AppendChar(0);
FXJSE_Value_SetUTF8String(args.GetReturnValue(), resultString.AsStringC());
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Stuff");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Stuff");
}
}
@@ -4990,9 +4913,8 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Substr");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Substr");
}
}
@@ -5013,9 +4935,8 @@
FX_GUID_ToString(&guid, bsUId, iNum);
FXJSE_Value_SetUTF8String(args.GetReturnValue(), bsUId.AsStringC());
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Uuid");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Uuid");
}
}
@@ -5057,9 +4978,8 @@
.AsStringC());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Upper");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"Upper");
}
}
@@ -5111,9 +5031,8 @@
FXJSE_Value_SetNull(args.GetReturnValue());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"WordNum");
+ ToJSContext(pThis, nullptr)
+ ->ThrowException(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"WordNum");
}
}
@@ -5318,8 +5237,7 @@
void CXFA_FM2JSContext::Get(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 1) {
CXFA_Document* pDoc = pContext->GetDocument();
if (!pDoc) {
@@ -5353,8 +5271,7 @@
void CXFA_FM2JSContext::Post(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
int32_t argc = args.GetLength();
if ((argc >= 2) && (argc <= 5)) {
CXFA_Document* pDoc = pContext->GetDocument();
@@ -5411,8 +5328,7 @@
void CXFA_FM2JSContext::Put(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
int32_t argc = args.GetLength();
if ((argc == 2) || (argc == 3)) {
CXFA_Document* pDoc = pContext->GetDocument();
@@ -5453,8 +5369,7 @@
void CXFA_FM2JSContext::assign_value_operator(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
if (args.GetLength() == 2) {
std::unique_ptr<CFXJSE_Value> lValue = args.GetValue(0);
@@ -5513,9 +5428,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first || second) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5535,9 +5448,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first && second) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5574,9 +5485,7 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5612,9 +5521,7 @@
}
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5622,9 +5529,7 @@
FX_BOOL CXFA_FM2JSContext::fm_ref_equal(CFXJSE_Value* pThis,
CFXJSE_Arguments& args) {
FX_BOOL bRet = FALSE;
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
std::unique_ptr<CFXJSE_Value> argFirst = args.GetValue(0);
std::unique_ptr<CFXJSE_Value> argSecond = args.GetValue(1);
if (FXJSE_Value_IsArray(argFirst.get()) &&
@@ -5641,8 +5546,8 @@
FXJSE_Value_GetObjectPropByIdx(argSecond.get(), 2, secondJSObject.get());
if (!FXJSE_Value_IsNull(firstJSObject.get()) &&
!FXJSE_Value_IsNull(secondJSObject.get())) {
- bRet = (FXJSE_Value_ToObject(firstJSObject.get(), nullptr) ==
- FXJSE_Value_ToObject(secondJSObject.get(), nullptr));
+ bRet = (firstJSObject->ToHostObject(nullptr) ==
+ secondJSObject->ToHostObject(nullptr));
}
}
}
@@ -5674,9 +5579,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first < second) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5709,9 +5612,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first <= second) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5740,9 +5641,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first > second) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5775,9 +5674,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first >= second) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5797,9 +5694,7 @@
FXJSE_Value_SetDouble(args.GetReturnValue(), first + second);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5819,9 +5714,7 @@
FXJSE_Value_SetDouble(args.GetReturnValue(), first - second);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5841,9 +5734,7 @@
FXJSE_Value_SetDouble(args.GetReturnValue(), first * second);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5851,8 +5742,7 @@
void CXFA_FM2JSContext::divide_operator(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 2) {
std::unique_ptr<CFXJSE_Value> argFirst = GetSimpleValue(pThis, args, 0);
std::unique_ptr<CFXJSE_Value> argSecond = GetSimpleValue(pThis, args, 1);
@@ -5886,9 +5776,7 @@
0.0 + ValueToDouble(pThis, argOne.get()));
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5905,9 +5793,7 @@
0.0 - ValueToDouble(pThis, argOne.get()));
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5924,9 +5810,7 @@
FXJSE_Value_SetInteger(args.GetReturnValue(), (first == 0.0) ? 1 : 0);
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
+ ToJSContext(pThis, nullptr)->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -5934,8 +5818,7 @@
void CXFA_FM2JSContext::dot_accessor(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
int32_t argc = args.GetLength();
if ((argc == 4) || (argc == 5)) {
@@ -6083,8 +5966,7 @@
void CXFA_FM2JSContext::dotdot_accessor(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
int32_t argc = args.GetLength();
if ((argc == 4) || (argc == 5)) {
@@ -6227,8 +6109,7 @@
void CXFA_FM2JSContext::eval_translation(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
if (args.GetLength() == 1) {
std::unique_ptr<CFXJSE_Value> argOne = GetSimpleValue(pThis, args, 0);
CFX_ByteString argString;
@@ -6287,8 +6168,7 @@
void CXFA_FM2JSContext::get_fm_value(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
if (args.GetLength() == 1) {
std::unique_ptr<CFXJSE_Value> argOne = args.GetValue(0);
@@ -6323,8 +6203,7 @@
std::unique_ptr<CFXJSE_Value> argOne = args.GetValue(0);
if (FXJSE_Value_IsArray(argOne.get())) {
#ifndef NDEBUG
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
std::unique_ptr<CFXJSE_Value> lengthValue(new CFXJSE_Value(pIsolate));
FXJSE_Value_GetObjectProp(argOne.get(), "length", lengthValue.get());
@@ -6335,8 +6214,7 @@
FXJSE_Value_Set(args.GetReturnValue(), argOne.get());
}
} else {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
pContext->ThrowException(XFA_IDS_COMPILER_ERROR);
}
}
@@ -6345,8 +6223,7 @@
void CXFA_FM2JSContext::fm_var_filter(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
if (args.GetLength() == 1) {
std::unique_ptr<CFXJSE_Value> argOne = args.GetValue(0);
@@ -6397,9 +6274,7 @@
void CXFA_FM2JSContext::concat_fm_object(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
uint32_t iLength = 0;
int32_t argc = args.GetLength();
std::vector<std::unique_ptr<CFXJSE_Value>> argValues;
@@ -6446,9 +6321,7 @@
CFXJSE_Value* pThis,
CFXJSE_Arguments& args,
uint32_t index) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
ASSERT(index < (uint32_t)args.GetLength());
std::unique_ptr<CFXJSE_Value> argIndex = args.GetValue(index);
if (FXJSE_Value_IsArray(argIndex.get())) {
@@ -6484,9 +6357,7 @@
// static
FX_BOOL CXFA_FM2JSContext::ValueIsNull(CFXJSE_Value* pThis, CFXJSE_Value* arg) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
FX_BOOL isNull = FALSE;
if (FXJSE_Value_IsNull(arg)) {
isNull = TRUE;
@@ -6530,9 +6401,7 @@
// static
int32_t CXFA_FM2JSContext::hvalue_get_array_length(CFXJSE_Value* pThis,
CFXJSE_Value* arg) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
int32_t iLength = 0;
if (FXJSE_Value_IsArray(arg)) {
std::unique_ptr<CFXJSE_Value> lengthValue(new CFXJSE_Value(pIsolate));
@@ -6572,9 +6441,7 @@
CFXJSE_Value**& resultValues,
int32_t& iCount,
int32_t iStart) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
iCount = 0;
int32_t argc = args.GetLength();
std::vector<std::unique_ptr<CFXJSE_Value>> argsValue;
@@ -6637,27 +6504,25 @@
}
// static
-void CXFA_FM2JSContext::GetObjectDefaultValue(CFXJSE_Value* pObjectValue,
+void CXFA_FM2JSContext::GetObjectDefaultValue(CFXJSE_Value* pValue,
CFXJSE_Value* pDefaultValue) {
- CXFA_Node* pNode =
- ToNode((CXFA_Object*)FXJSE_Value_ToObject(pObjectValue, nullptr));
- if (pNode) {
- pNode->Script_Som_DefaultValue(pDefaultValue, FALSE, (XFA_ATTRIBUTE)-1);
- } else {
+ CXFA_Node* pNode = ToNode(CXFA_ScriptContext::ToObject(pValue, nullptr));
+ if (!pNode) {
FXJSE_Value_SetNull(pDefaultValue);
+ return;
}
+ pNode->Script_Som_DefaultValue(pDefaultValue, FALSE, (XFA_ATTRIBUTE)-1);
}
// static
-FX_BOOL CXFA_FM2JSContext::SetObjectDefaultValue(CFXJSE_Value* pObjectValue,
+FX_BOOL CXFA_FM2JSContext::SetObjectDefaultValue(CFXJSE_Value* pValue,
CFXJSE_Value* hNewValue) {
- CXFA_Node* pNode =
- ToNode((CXFA_Object*)FXJSE_Value_ToObject(pObjectValue, nullptr));
- if (pNode) {
- pNode->Script_Som_DefaultValue(hNewValue, TRUE, (XFA_ATTRIBUTE)-1);
- return TRUE;
- }
- return FALSE;
+ CXFA_Node* pNode = ToNode(CXFA_ScriptContext::ToObject(pValue, nullptr));
+ if (!pNode)
+ return FALSE;
+
+ pNode->Script_Som_DefaultValue(hNewValue, TRUE, (XFA_ATTRIBUTE)-1);
+ return TRUE;
}
// static
@@ -6697,9 +6562,7 @@
CFXJSE_Value* accessorValue,
const CFX_ByteStringC& szAccessorName) {
FX_BOOL bFlags = FALSE;
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return bFlags;
}
@@ -6728,9 +6591,7 @@
FX_BOOL bHasNoResolveName) {
CFX_WideString wsSomExpression = CFX_WideString::FromUTF8(bsSomExp);
int32_t iRet = -1;
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- CXFA_Document* pDoc = pContext->GetDocument();
+ CXFA_Document* pDoc = ToJSContext(pThis, nullptr)->GetDocument();
if (!pDoc) {
return iRet;
}
@@ -6742,7 +6603,7 @@
pNode = pScriptContext->GetThisObject();
dFlags = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent;
} else {
- pNode = (CXFA_Object*)FXJSE_Value_ToObject(pRefValue, nullptr);
+ pNode = CXFA_ScriptContext::ToObject(pRefValue, nullptr);
ASSERT(pNode);
if (bHasNoResolveName) {
CFX_WideString wsName;
@@ -6764,7 +6625,7 @@
}
}
} else {
- pNode = (CXFA_Object*)FXJSE_Value_ToObject(pRefValue, nullptr);
+ pNode = CXFA_ScriptContext::ToObject(pRefValue, nullptr);
dFlags = XFA_RESOLVENODE_AnyChild;
}
iRet = pScriptContext->ResolveObjects(pNode, wsSomExpression.AsStringC(),
@@ -6780,8 +6641,7 @@
CFXJSE_Value**& resultValues,
int32_t& iSize,
FX_BOOL& bAttribute) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_FM2JSContext* pContext = ToJSContext(pThis, nullptr);
v8::Isolate* pIsolate = pContext->GetScriptRuntime();
iSize = 0;
resultValues = nullptr;
@@ -6821,9 +6681,7 @@
// static
int32_t CXFA_FM2JSContext::ValueToInteger(CFXJSE_Value* pThis,
CFXJSE_Value* pValue) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
int32_t iValue = 0;
if (FXJSE_Value_IsArray(pValue)) {
std::unique_ptr<CFXJSE_Value> propertyValue(new CFXJSE_Value(pIsolate));
@@ -6859,9 +6717,7 @@
// static
FX_FLOAT CXFA_FM2JSContext::ValueToFloat(CFXJSE_Value* pThis,
CFXJSE_Value* arg) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
FX_FLOAT fRet = 0.0f;
if (FXJSE_Value_IsArray(arg)) {
std::unique_ptr<CFXJSE_Value> propertyValue(new CFXJSE_Value(pIsolate));
@@ -6897,9 +6753,7 @@
// static
FX_DOUBLE CXFA_FM2JSContext::ValueToDouble(CFXJSE_Value* pThis,
CFXJSE_Value* arg) {
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
FX_DOUBLE dRet = 0;
if (FXJSE_Value_IsArray(arg)) {
std::unique_ptr<CFXJSE_Value> propertyValue(new CFXJSE_Value(pIsolate));
@@ -6938,10 +6792,7 @@
bool* ret) {
ASSERT(ret);
- CXFA_FM2JSContext* pContext =
- static_cast<CXFA_FM2JSContext*>(FXJSE_Value_ToObject(pThis, nullptr));
- v8::Isolate* pIsolate = pContext->GetScriptRuntime();
-
+ v8::Isolate* pIsolate = ToJSContext(pThis, nullptr)->GetScriptRuntime();
*ret = true;
if (FXJSE_Value_IsArray(src)) {
diff --git a/xfa/fxfa/parser/cxfa_valuearray.cpp b/xfa/fxfa/parser/cxfa_valuearray.cpp
new file mode 100644
index 0000000..face1b4
--- /dev/null
+++ b/xfa/fxfa/parser/cxfa_valuearray.cpp
@@ -0,0 +1,22 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxfa/parser/cxfa_valuearray.h"
+
+#include "xfa/fxfa/parser/xfa_script_imp.h"
+
+CXFA_ValueArray::CXFA_ValueArray(v8::Isolate* pIsolate)
+ : m_pIsolate(pIsolate) {}
+
+CXFA_ValueArray::~CXFA_ValueArray() {
+ for (int32_t i = 0; i < GetSize(); i++)
+ delete GetAt(i);
+}
+
+void CXFA_ValueArray::GetAttributeObject(CXFA_ObjArray& objArray) {
+ for (int32_t i = 0; i < GetSize(); i++)
+ objArray.Add(CXFA_ScriptContext::ToObject(GetAt(i), nullptr));
+}
diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h
new file mode 100644
index 0000000..b2825fa
--- /dev/null
+++ b/xfa/fxfa/parser/cxfa_valuearray.h
@@ -0,0 +1,23 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
+#define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
+
+#include "xfa/fxfa/include/fxfa.h"
+#include "xfa/fxjse/value.h"
+
+class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {
+ public:
+ explicit CXFA_ValueArray(v8::Isolate* pIsolate);
+ ~CXFA_ValueArray();
+
+ void GetAttributeObject(CXFA_ObjArray& objArray);
+
+ v8::Isolate* const m_pIsolate;
+};
+
+#endif // XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_
diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h
index da348f7..e81a7b9 100644
--- a/xfa/fxfa/parser/xfa_script.h
+++ b/xfa/fxfa/parser/xfa_script.h
@@ -8,6 +8,7 @@
#define XFA_FXFA_PARSER_XFA_SCRIPT_H_
#include "xfa/fxfa/include/fxfa.h"
+#include "xfa/fxfa/parser/cxfa_valuearray.h"
#include "xfa/fxjse/value.h"
#define XFA_RESOLVENODE_Children 0x0001
@@ -36,26 +37,6 @@
XFA_RESOVENODE_RSTYPE_ExistNodes,
};
-class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> {
- public:
- CXFA_ValueArray(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
-
- ~CXFA_ValueArray() {
- for (int32_t i = 0; i < GetSize(); i++) {
- delete GetAt(i);
- }
- }
-
- void GetAttributeObject(CXFA_ObjArray& objArray) {
- for (int32_t i = 0; i < GetSize(); i++) {
- objArray.Add(
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(GetAt(i), nullptr)));
- }
- }
-
- v8::Isolate* m_pIsolate;
-};
-
struct XFA_RESOLVENODE_RS {
XFA_RESOLVENODE_RS()
: dwFlags(XFA_RESOVENODE_RSTYPE_Nodes), pScriptAttribute(NULL) {}
diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
index 3b5f681..3adabe6 100644
--- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
@@ -19,6 +19,14 @@
#include "xfa/fxfa/parser/xfa_utils.h"
#include "xfa/fxjse/cfxjse_arguments.h"
+namespace {
+
+CXFA_Node* ToNode(CFXJSE_Value* pValue, CFXJSE_Class* pClass) {
+ return static_cast<CXFA_Node*>(pValue->ToHostObject(pClass));
+}
+
+} // namespace
+
CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument)
: CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) {
m_uScriptHash = XFA_HASHCODE_Host;
@@ -309,8 +317,7 @@
if (iLength >= 1) {
std::unique_ptr<CFXJSE_Value> pValue(pArguments->GetValue(0));
if (FXJSE_Value_IsObject(pValue.get())) {
- pNode =
- static_cast<CXFA_Node*>(FXJSE_Value_ToObject(pValue.get(), nullptr));
+ pNode = ToNode(pValue.get(), nullptr);
} else if (FXJSE_Value_IsUTF8String(pValue.get())) {
CFX_ByteString bsString;
FXJSE_Value_ToUTF8String(pValue.get(), bsString);
@@ -507,8 +514,7 @@
if (iLength >= 1) {
std::unique_ptr<CFXJSE_Value> pValue(pArguments->GetValue(0));
if (FXJSE_Value_IsObject(pValue.get())) {
- pNode =
- static_cast<CXFA_Node*>(FXJSE_Value_ToObject(pValue.get(), nullptr));
+ pNode = ToNode(pValue.get(), nullptr);
} else if (FXJSE_Value_IsUTF8String(pValue.get())) {
CFX_ByteString bsString;
FXJSE_Value_ToUTF8String(pValue.get(), bsString);
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index 528758f..55034a6 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -66,8 +66,18 @@
const char kFormCalcRuntime[] = "foxit_xfa_formcalc_runtime";
+CXFA_ThisProxy* ToThisProxy(CFXJSE_Value* pValue, CFXJSE_Class* pClass) {
+ return static_cast<CXFA_ThisProxy*>(pValue->ToHostObject(pClass));
+}
+
} // namespace
+// static.
+CXFA_Object* CXFA_ScriptContext::ToObject(CFXJSE_Value* pValue,
+ CFXJSE_Class* pClass) {
+ return static_cast<CXFA_Object*>(pValue->ToHostObject(pClass));
+}
+
CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument)
: m_pDocument(pDocument),
m_pJsContext(nullptr),
@@ -147,8 +157,7 @@
void CXFA_ScriptContext::GlobalPropertySetter(CFXJSE_Value* pObject,
const CFX_ByteStringC& szPropName,
CFXJSE_Value* pValue) {
- CXFA_Object* lpOrginalNode =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pObject, nullptr));
+ CXFA_Object* lpOrginalNode = ToObject(pObject, nullptr);
CXFA_Document* pDoc = lpOrginalNode->GetDocument();
CXFA_ScriptContext* lpScriptContext =
(CXFA_ScriptContext*)pDoc->GetScriptContext();
@@ -204,8 +213,7 @@
void CXFA_ScriptContext::GlobalPropertyGetter(CFXJSE_Value* pObject,
const CFX_ByteStringC& szPropName,
CFXJSE_Value* pValue) {
- CXFA_Object* pOriginalObject =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pObject, nullptr));
+ CXFA_Object* pOriginalObject = ToObject(pObject, nullptr);
CXFA_Document* pDoc = pOriginalObject->GetDocument();
CXFA_ScriptContext* lpScriptContext =
(CXFA_ScriptContext*)pDoc->GetScriptContext();
@@ -259,8 +267,7 @@
void CXFA_ScriptContext::NormalPropertyGetter(CFXJSE_Value* pOriginalValue,
const CFX_ByteStringC& szPropName,
CFXJSE_Value* pReturnValue) {
- CXFA_Object* pOriginalObject =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pOriginalValue, nullptr));
+ CXFA_Object* pOriginalObject = ToObject(pOriginalValue, nullptr);
if (!pOriginalObject) {
FXJSE_Value_SetUndefined(pReturnValue);
return;
@@ -305,8 +312,7 @@
void CXFA_ScriptContext::NormalPropertySetter(CFXJSE_Value* pOriginalValue,
const CFX_ByteStringC& szPropName,
CFXJSE_Value* pReturnValue) {
- CXFA_Object* pOriginalObject =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pOriginalValue, nullptr));
+ CXFA_Object* pOriginalObject = ToObject(pOriginalValue, nullptr);
if (!pOriginalObject)
return;
@@ -357,8 +363,7 @@
CFXJSE_Value* pOriginalValue,
const CFX_ByteStringC& szPropName,
FX_BOOL bQueryIn) {
- CXFA_Object* pObject =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pOriginalValue, nullptr));
+ CXFA_Object* pObject = ToObject(pOriginalValue, nullptr);
if (!pObject)
return FXJSE_ClassPropType_None;
@@ -380,8 +385,7 @@
CFXJSE_Value* pOriginalValue,
const CFX_ByteStringC& szPropName,
FX_BOOL bQueryIn) {
- CXFA_Object* pObject =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pOriginalValue, nullptr));
+ CXFA_Object* pObject = ToObject(pOriginalValue, nullptr);
if (!pObject)
return FXJSE_ClassPropType_None;
@@ -398,8 +402,7 @@
void CXFA_ScriptContext::NormalMethodCall(CFXJSE_Value* pThis,
const CFX_ByteStringC& szFuncName,
CFXJSE_Arguments& args) {
- CXFA_Object* pObject =
- static_cast<CXFA_Object*>(FXJSE_Value_ToObject(pThis, nullptr));
+ CXFA_Object* pObject = ToObject(pThis, nullptr);
if (!pObject)
return;
@@ -530,8 +533,7 @@
m_mapVariableToContext.GetNextAssoc(ps, pScriptNode, pVariableContext);
std::unique_ptr<CFXJSE_Value> pObject(
FXJSE_Context_GetGlobalObject(pVariableContext));
- delete static_cast<CXFA_ThisProxy*>(
- FXJSE_Value_ToObject(pObject.get(), nullptr));
+ delete ToThisProxy(pObject.get(), nullptr);
FXJSE_Context_Release(pVariableContext);
}
m_mapVariableToContext.RemoveAll();
@@ -653,8 +655,7 @@
(rndFind.m_Nodes[0]->*(rndFind.m_pScriptAttribute->lpfnCallback))(
pValue.get(), FALSE,
(XFA_ATTRIBUTE)rndFind.m_pScriptAttribute->eAttribute);
- rndFind.m_Nodes.SetAt(0, static_cast<CXFA_Object*>(FXJSE_Value_ToObject(
- pValue.get(), nullptr)));
+ rndFind.m_Nodes.SetAt(0, ToObject(pValue.get(), nullptr));
}
int32_t iSize = m_upObjectArray.GetSize();
if (iSize) {
diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h
index 91f5f0a..86d3f37 100644
--- a/xfa/fxfa/parser/xfa_script_imp.h
+++ b/xfa/fxfa/parser/xfa_script_imp.h
@@ -93,6 +93,8 @@
CXFA_NodeArray& GetUpObjectArray() { return m_upObjectArray; }
CXFA_Document* GetDocument() const { return m_pDocument; }
+ static CXFA_Object* ToObject(CFXJSE_Value* pValue, CFXJSE_Class* pClass);
+
private:
void DefineJsContext();
CFXJSE_Context* CreateVariablesContext(CXFA_Node* pScriptNode,
diff --git a/xfa/fxjse/include/fxjse.h b/xfa/fxjse/include/fxjse.h
index 8a34ad0..cf6fbf9 100644
--- a/xfa/fxjse/include/fxjse.h
+++ b/xfa/fxjse/include/fxjse.h
@@ -93,8 +93,6 @@
int32_t FXJSE_Value_ToInteger(CFXJSE_Value* pValue);
void FXJSE_Value_ToUTF8String(CFXJSE_Value* pValue,
CFX_ByteString& szStrOutput);
-CFXJSE_HostObject* FXJSE_Value_ToObject(CFXJSE_Value* pValue,
- CFXJSE_Class* pClass);
void FXJSE_Value_SetUndefined(CFXJSE_Value* pValue);
void FXJSE_Value_SetNull(CFXJSE_Value* pValue);
diff --git a/xfa/fxjse/value.cpp b/xfa/fxjse/value.cpp
index b369c0b..60fa09c 100644
--- a/xfa/fxjse/value.cpp
+++ b/xfa/fxjse/value.cpp
@@ -64,11 +64,6 @@
return pValue->ToInteger();
}
-CFXJSE_HostObject* FXJSE_Value_ToObject(CFXJSE_Value* pValue,
- CFXJSE_Class* pClass) {
- return pValue->ToObject(pClass);
-}
-
void FXJSE_Value_SetUndefined(CFXJSE_Value* pValue) {
pValue->SetUndefined();
}
@@ -198,7 +193,7 @@
pIsolate->ThrowException(hError);
}
-CFXJSE_HostObject* CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const {
+CFXJSE_HostObject* CFXJSE_Value::ToHostObject(CFXJSE_Class* lpClass) const {
ASSERT(!m_hValue.IsEmpty());
CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
diff --git a/xfa/fxjse/value.h b/xfa/fxjse/value.h
index 362cd64..84045d6 100644
--- a/xfa/fxjse/value.h
+++ b/xfa/fxjse/value.h
@@ -141,7 +141,7 @@
v8::String::Utf8Value hStringVal(hString);
szStrOutput = *hStringVal;
}
- CFXJSE_HostObject* ToObject(CFXJSE_Class* lpClass) const;
+ CFXJSE_HostObject* ToHostObject(CFXJSE_Class* lpClass) const;
V8_INLINE void SetUndefined() {
CFXJSE_ScopeUtil_IsolateHandle scope(m_pIsolate);
