Move cjs_v8.cpp to cfx_v8.cpp
The layering should be CJS => CFXJS => CFX_V8 with the CJS name
being higher up.
Change-Id: Ic130f248906e9c4df641dd508389b0555786b999
Reviewed-on: https://pdfium-review.googlesource.com/26051
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index eda279b..4931249 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1201,6 +1201,8 @@
"fxjs/CJX_Define.h",
"fxjs/JS_Define.cpp",
"fxjs/JS_Define.h",
+ "fxjs/cfx_v8.cpp",
+ "fxjs/cfx_v8.h",
"fxjs/cjs_annot.cpp",
"fxjs/cjs_annot.h",
"fxjs/cjs_app.cpp",
@@ -1267,8 +1269,6 @@
"fxjs/cjs_timerobj.h",
"fxjs/cjs_util.cpp",
"fxjs/cjs_util.h",
- "fxjs/cjs_v8.cpp",
- "fxjs/cjs_v8.h",
"fxjs/cjs_zoomtype.cpp",
"fxjs/cjs_zoomtype.h",
"fxjs/fxjs_v8.cpp",
diff --git a/fxjs/CJX_Define.h b/fxjs/CJX_Define.h
index 4a26fd4..bff624f 100644
--- a/fxjs/CJX_Define.h
+++ b/fxjs/CJX_Define.h
@@ -9,26 +9,26 @@
#include <vector>
+#include "fxjs/cfx_v8.h"
#include "fxjs/cjs_return.h"
-#include "fxjs/cjs_v8.h"
template <class C,
- CJS_Return (C::*M)(CJS_V8* runtime,
+ CJS_Return (C::*M)(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params)>
CJS_Return JSMethod(C* node,
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return (node->*M)(runtime, params);
}
#define JS_METHOD(method_name, class_name) \
static CJS_Return method_name##_static( \
- CJX_Object* node, CJS_V8* runtime, \
+ CJX_Object* node, CFX_V8* runtime, \
const std::vector<v8::Local<v8::Value>>& params) { \
return JSMethod<class_name, &class_name::method_name>( \
static_cast<class_name*>(node), runtime, params); \
} \
- CJS_Return method_name(CJS_V8* runtime, \
+ CJS_Return method_name(CFX_V8* runtime, \
const std::vector<v8::Local<v8::Value>>& params)
#define JS_PROP(prop_name) \
diff --git a/fxjs/cjs_v8.cpp b/fxjs/cfx_v8.cpp
similarity index 77%
rename from fxjs/cjs_v8.cpp
rename to fxjs/cfx_v8.cpp
index e6948a3..80b9eda 100644
--- a/fxjs/cjs_v8.cpp
+++ b/fxjs/cfx_v8.cpp
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fxjs/cjs_v8.h"
+#include "fxjs/cfx_v8.h"
-CJS_V8::CJS_V8(v8::Isolate* isolate) : m_isolate(isolate) {}
+CFX_V8::CFX_V8(v8::Isolate* isolate) : m_isolate(isolate) {}
-CJS_V8::~CJS_V8() = default;
+CFX_V8::~CFX_V8() = default;
-v8::Local<v8::Value> CJS_V8::GetObjectProperty(
+v8::Local<v8::Value> CFX_V8::GetObjectProperty(
v8::Local<v8::Object> pObj,
const WideString& wsPropertyName) {
if (pObj.IsEmpty())
@@ -23,7 +23,7 @@
return val;
}
-std::vector<WideString> CJS_V8::GetObjectPropertyNames(
+std::vector<WideString> CFX_V8::GetObjectPropertyNames(
v8::Local<v8::Object> pObj) {
if (pObj.IsEmpty())
return std::vector<WideString>();
@@ -41,7 +41,7 @@
return result;
}
-void CJS_V8::PutObjectProperty(v8::Local<v8::Object> pObj,
+void CFX_V8::PutObjectProperty(v8::Local<v8::Object> pObj,
const WideString& wsPropertyName,
v8::Local<v8::Value> pPut) {
if (pObj.IsEmpty())
@@ -51,15 +51,15 @@
.FromJust();
}
-v8::Local<v8::Array> CJS_V8::NewArray() {
+v8::Local<v8::Array> CFX_V8::NewArray() {
return v8::Array::New(m_isolate);
}
-v8::Local<v8::Object> CJS_V8::NewObject() {
+v8::Local<v8::Object> CFX_V8::NewObject() {
return v8::Object::New(m_isolate);
}
-unsigned CJS_V8::PutArrayElement(v8::Local<v8::Array> pArray,
+unsigned CFX_V8::PutArrayElement(v8::Local<v8::Array> pArray,
unsigned index,
v8::Local<v8::Value> pValue) {
if (pArray.IsEmpty())
@@ -69,7 +69,7 @@
return 1;
}
-v8::Local<v8::Value> CJS_V8::GetArrayElement(v8::Local<v8::Array> pArray,
+v8::Local<v8::Value> CFX_V8::GetArrayElement(v8::Local<v8::Array> pArray,
unsigned index) {
if (pArray.IsEmpty())
return v8::Local<v8::Value>();
@@ -79,57 +79,57 @@
return val;
}
-unsigned CJS_V8::GetArrayLength(v8::Local<v8::Array> pArray) {
+unsigned CFX_V8::GetArrayLength(v8::Local<v8::Array> pArray) {
if (pArray.IsEmpty())
return 0;
return pArray->Length();
}
-v8::Local<v8::Number> CJS_V8::NewNumber(int number) {
+v8::Local<v8::Number> CFX_V8::NewNumber(int number) {
return v8::Int32::New(m_isolate, number);
}
-v8::Local<v8::Number> CJS_V8::NewNumber(double number) {
+v8::Local<v8::Number> CFX_V8::NewNumber(double number) {
return v8::Number::New(m_isolate, number);
}
-v8::Local<v8::Number> CJS_V8::NewNumber(float number) {
+v8::Local<v8::Number> CFX_V8::NewNumber(float number) {
return v8::Number::New(m_isolate, (float)number);
}
-v8::Local<v8::Boolean> CJS_V8::NewBoolean(bool b) {
+v8::Local<v8::Boolean> CFX_V8::NewBoolean(bool b) {
return v8::Boolean::New(m_isolate, b);
}
-v8::Local<v8::String> CJS_V8::NewString(const ByteStringView& str) {
+v8::Local<v8::String> CFX_V8::NewString(const ByteStringView& str) {
v8::Isolate* pIsolate = m_isolate ? m_isolate : v8::Isolate::GetCurrent();
return v8::String::NewFromUtf8(pIsolate, str.unterminated_c_str(),
v8::NewStringType::kNormal, str.GetLength())
.ToLocalChecked();
}
-v8::Local<v8::String> CJS_V8::NewString(const WideStringView& str) {
+v8::Local<v8::String> CFX_V8::NewString(const WideStringView& str) {
// Conversion from pdfium's wchar_t wide-strings to v8's uint16_t
// wide-strings isn't handled by v8, so use UTF8 as a common
// intermediate format.
return NewString(FX_UTF8Encode(str).AsStringView());
}
-v8::Local<v8::Value> CJS_V8::NewNull() {
+v8::Local<v8::Value> CFX_V8::NewNull() {
return v8::Null(m_isolate);
}
-v8::Local<v8::Value> CJS_V8::NewUndefined() {
+v8::Local<v8::Value> CFX_V8::NewUndefined() {
return v8::Undefined(m_isolate);
}
-v8::Local<v8::Date> CJS_V8::NewDate(double d) {
+v8::Local<v8::Date> CFX_V8::NewDate(double d) {
return v8::Date::New(m_isolate->GetCurrentContext(), d)
.ToLocalChecked()
.As<v8::Date>();
}
-int CJS_V8::ToInt32(v8::Local<v8::Value> pValue) {
+int CFX_V8::ToInt32(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty())
return 0;
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
@@ -139,7 +139,7 @@
return maybe_int32.ToLocalChecked()->Value();
}
-bool CJS_V8::ToBoolean(v8::Local<v8::Value> pValue) {
+bool CFX_V8::ToBoolean(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty())
return false;
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
@@ -149,7 +149,7 @@
return maybe_boolean.ToLocalChecked()->Value();
}
-double CJS_V8::ToDouble(v8::Local<v8::Value> pValue) {
+double CFX_V8::ToDouble(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty())
return 0.0;
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
@@ -159,7 +159,7 @@
return maybe_number.ToLocalChecked()->Value();
}
-WideString CJS_V8::ToWideString(v8::Local<v8::Value> pValue) {
+WideString CFX_V8::ToWideString(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty())
return WideString();
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
@@ -170,7 +170,7 @@
return WideString::FromUTF8(ByteStringView(*s, s.length()));
}
-ByteString CJS_V8::ToByteString(v8::Local<v8::Value> pValue) {
+ByteString CFX_V8::ToByteString(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty())
return ByteString();
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
@@ -181,14 +181,14 @@
return ByteString(*s);
}
-v8::Local<v8::Object> CJS_V8::ToObject(v8::Local<v8::Value> pValue) {
+v8::Local<v8::Object> CFX_V8::ToObject(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty() || !pValue->IsObject())
return v8::Local<v8::Object>();
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
return pValue->ToObject(context).ToLocalChecked();
}
-v8::Local<v8::Array> CJS_V8::ToArray(v8::Local<v8::Value> pValue) {
+v8::Local<v8::Array> CFX_V8::ToArray(v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty() || !pValue->IsArray())
return v8::Local<v8::Array>();
v8::Local<v8::Context> context = m_isolate->GetCurrentContext();
diff --git a/fxjs/cjs_v8.h b/fxjs/cfx_v8.h
similarity index 90%
rename from fxjs/cjs_v8.h
rename to fxjs/cfx_v8.h
index 4599da3..2f9794c 100644
--- a/fxjs/cjs_v8.h
+++ b/fxjs/cfx_v8.h
@@ -4,22 +4,21 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FXJS_CJS_V8_H_
-#define FXJS_CJS_V8_H_
+#ifndef FXJS_CFX_V8_H_
+#define FXJS_CFX_V8_H_
#include <map>
#include <vector>
-#include "core/fxcrt/bytestring.h"
#include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/widestring.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "v8/include/v8-util.h"
#include "v8/include/v8.h"
-class CJS_V8 {
+class CFX_V8 {
public:
- explicit CJS_V8(v8::Isolate* pIsolate);
- virtual ~CJS_V8();
+ explicit CFX_V8(v8::Isolate* pIsolate);
+ virtual ~CFX_V8();
v8::Isolate* GetIsolate() const { return m_isolate; }
@@ -66,4 +65,4 @@
v8::Isolate* m_isolate;
};
-#endif // FXJS_CJS_V8_H_
+#endif // FXJS_CFX_V8_H_
diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp
index 1c07a94..d5a1511 100644
--- a/fxjs/cfxjse_engine.cpp
+++ b/fxjs/cfxjse_engine.cpp
@@ -94,7 +94,7 @@
CFXJSE_Engine::CFXJSE_Engine(CXFA_Document* pDocument,
CFXJS_Engine* fxjs_engine)
- : CJS_V8(fxjs_engine->GetIsolate()),
+ : CFX_V8(fxjs_engine->GetIsolate()),
m_pDocument(pDocument),
m_JsContext(CFXJSE_Context::Create(fxjs_engine->GetIsolate(),
fxjs_engine,
diff --git a/fxjs/cfxjse_engine.h b/fxjs/cfxjse_engine.h
index 2e44dec..ca5f3ee 100644
--- a/fxjs/cfxjse_engine.h
+++ b/fxjs/cfxjse_engine.h
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
+#include "fxjs/cfx_v8.h"
#include "fxjs/cfxjse_formcalc_context.h"
-#include "fxjs/cjs_v8.h"
#include "v8/include/v8.h"
#include "xfa/fxfa/cxfa_eventparam.h"
#include "xfa/fxfa/parser/cxfa_document.h"
@@ -25,7 +25,7 @@
class CFXJS_Engine;
class CXFA_List;
-class CFXJSE_Engine : public CJS_V8 {
+class CFXJSE_Engine : public CFX_V8 {
public:
static CXFA_Object* ToObject(const v8::FunctionCallbackInfo<v8::Value>& info);
static CXFA_Object* ToObject(CFXJSE_Value* pValue, CFXJSE_Class* pClass);
diff --git a/fxjs/fxjs_v8.cpp b/fxjs/fxjs_v8.cpp
index 3d82848..0e87024 100644
--- a/fxjs/fxjs_v8.cpp
+++ b/fxjs/fxjs_v8.cpp
@@ -257,9 +257,9 @@
FXJS_PerIsolateData::FXJS_PerIsolateData(v8::Isolate* pIsolate)
: m_pDynamicObjsMap(new V8TemplateMap(pIsolate)) {}
-CFXJS_Engine::CFXJS_Engine() : CJS_V8(nullptr) {}
+CFXJS_Engine::CFXJS_Engine() : CFX_V8(nullptr) {}
-CFXJS_Engine::CFXJS_Engine(v8::Isolate* pIsolate) : CJS_V8(pIsolate) {}
+CFXJS_Engine::CFXJS_Engine(v8::Isolate* pIsolate) : CFX_V8(pIsolate) {}
CFXJS_Engine::~CFXJS_Engine() = default;
diff --git a/fxjs/fxjs_v8.h b/fxjs/fxjs_v8.h
index 2c53b65..831f839 100644
--- a/fxjs/fxjs_v8.h
+++ b/fxjs/fxjs_v8.h
@@ -20,7 +20,7 @@
#include <vector>
#include "core/fxcrt/fx_string.h"
-#include "fxjs/cjs_v8.h"
+#include "fxjs/cfx_v8.h"
#include "v8/include/v8-util.h"
#include "v8/include/v8.h"
@@ -127,7 +127,7 @@
// Get the global isolate's ref count.
size_t FXJS_GlobalIsolateRefCount();
-class CFXJS_Engine : public CJS_V8 {
+class CFXJS_Engine : public CFX_V8 {
public:
explicit CFXJS_Engine(v8::Isolate* pIsolate);
~CFXJS_Engine() override;
diff --git a/fxjs/xfa/cjx_container.cpp b/fxjs/xfa/cjx_container.cpp
index b7577da..e5dbfe8 100644
--- a/fxjs/xfa/cjx_container.cpp
+++ b/fxjs/xfa/cjx_container.cpp
@@ -25,13 +25,13 @@
CJX_Container::~CJX_Container() {}
CJS_Return CJX_Container::getDelta(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_Container::getDeltas(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_ArrayNodeList* pFormNodes = new CXFA_ArrayNodeList(GetDocument());
return CJS_Return(static_cast<CFXJSE_Engine*>(runtime)->NewXFAObject(
diff --git a/fxjs/xfa/cjx_datawindow.cpp b/fxjs/xfa/cjx_datawindow.cpp
index 5209cb4..cdb6aab 100644
--- a/fxjs/xfa/cjx_datawindow.cpp
+++ b/fxjs/xfa/cjx_datawindow.cpp
@@ -25,25 +25,25 @@
CJX_DataWindow::~CJX_DataWindow() {}
CJS_Return CJX_DataWindow::moveCurrentRecord(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_DataWindow::record(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_DataWindow::gotoRecord(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_DataWindow::isRecordGroup(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
diff --git a/fxjs/xfa/cjx_delta.cpp b/fxjs/xfa/cjx_delta.cpp
index 6d8cbd5..1da5953 100644
--- a/fxjs/xfa/cjx_delta.cpp
+++ b/fxjs/xfa/cjx_delta.cpp
@@ -20,7 +20,7 @@
CJX_Delta::~CJX_Delta() {}
-CJS_Return CJX_Delta::restore(CJS_V8* runtime,
+CJS_Return CJX_Delta::restore(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_desc.cpp b/fxjs/xfa/cjx_desc.cpp
index a49ae63..ae125c2 100644
--- a/fxjs/xfa/cjx_desc.cpp
+++ b/fxjs/xfa/cjx_desc.cpp
@@ -20,7 +20,7 @@
CJX_Desc::~CJX_Desc() {}
-CJS_Return CJX_Desc::metadata(CJS_V8* runtime,
+CJS_Return CJX_Desc::metadata(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 0 && params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index 1362a32..db5c14a 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -151,7 +151,7 @@
}
CJS_Return CJX_EventPseudoModel::emit(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
if (!pScriptContext)
@@ -174,7 +174,7 @@
}
CJS_Return CJX_EventPseudoModel::reset(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CFXJSE_Engine* pScriptContext = GetDocument()->GetScriptContext();
if (!pScriptContext)
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp
index 85a6697..2b66484 100644
--- a/fxjs/xfa/cjx_exclgroup.cpp
+++ b/fxjs/xfa/cjx_exclgroup.cpp
@@ -31,7 +31,7 @@
CJX_ExclGroup::~CJX_ExclGroup() {}
CJS_Return CJX_ExclGroup::execEvent(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -42,7 +42,7 @@
}
CJS_Return CJX_ExclGroup::execInitialize(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -55,7 +55,7 @@
}
CJS_Return CJX_ExclGroup::execCalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -68,7 +68,7 @@
}
CJS_Return CJX_ExclGroup::execValidate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -83,7 +83,7 @@
}
CJS_Return CJX_ExclGroup::selectedMember(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp
index 2b755b7..d3f0280 100644
--- a/fxjs/xfa/cjx_field.cpp
+++ b/fxjs/xfa/cjx_field.cpp
@@ -39,7 +39,7 @@
CJX_Field::~CJX_Field() {}
CJS_Return CJX_Field::clearItems(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_Node* node = GetXFANode();
if (node->IsWidgetReady())
@@ -48,7 +48,7 @@
}
CJS_Return CJX_Field::execEvent(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -63,7 +63,7 @@
}
CJS_Return CJX_Field::execInitialize(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -77,7 +77,7 @@
}
CJS_Return CJX_Field::deleteItem(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -91,7 +91,7 @@
}
CJS_Return CJX_Field::getSaveItem(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -112,7 +112,7 @@
}
CJS_Return CJX_Field::boundItem(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -127,7 +127,7 @@
}
CJS_Return CJX_Field::getItemState(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -141,7 +141,7 @@
}
CJS_Return CJX_Field::execCalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -155,7 +155,7 @@
}
CJS_Return CJX_Field::getDisplayItem(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -176,7 +176,7 @@
}
CJS_Return CJX_Field::setItemState(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -196,7 +196,7 @@
return CJS_Return(true);
}
-CJS_Return CJX_Field::addItem(CJS_V8* runtime,
+CJS_Return CJX_Field::addItem(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1 && params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -218,7 +218,7 @@
}
CJS_Return CJX_Field::execValidate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp
index 32de9f5..fa244b3 100644
--- a/fxjs/xfa/cjx_form.cpp
+++ b/fxjs/xfa/cjx_form.cpp
@@ -32,7 +32,7 @@
CJX_Form::~CJX_Form() {}
CJS_Return CJX_Form::formNodes(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -53,7 +53,7 @@
return CJS_Return(value->DirectGetValue().Get(runtime->GetIsolate()));
}
-CJS_Return CJX_Form::remerge(CJS_V8* runtime,
+CJS_Return CJX_Form::remerge(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -63,7 +63,7 @@
}
CJS_Return CJX_Form::execInitialize(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -76,7 +76,7 @@
}
CJS_Return CJX_Form::recalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_EventParam* pEventParam =
GetDocument()->GetScriptContext()->GetEventParam();
@@ -98,7 +98,7 @@
}
CJS_Return CJX_Form::execCalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -111,7 +111,7 @@
}
CJS_Return CJX_Form::execValidate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 0)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_hostpseudomodel.cpp b/fxjs/xfa/cjx_hostpseudomodel.cpp
index fd57099..5c63fc8 100644
--- a/fxjs/xfa/cjx_hostpseudomodel.cpp
+++ b/fxjs/xfa/cjx_hostpseudomodel.cpp
@@ -246,7 +246,7 @@
}
CJS_Return CJX_HostPseudoModel::gotoURL(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!GetDocument()->GetScriptContext()->IsRunAtClient())
return CJS_Return(true);
@@ -265,7 +265,7 @@
}
CJS_Return CJX_HostPseudoModel::openList(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!GetDocument()->GetScriptContext()->IsRunAtClient())
return CJS_Return(true);
@@ -317,7 +317,7 @@
}
CJS_Return CJX_HostPseudoModel::response(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 4)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -348,13 +348,13 @@
}
CJS_Return CJX_HostPseudoModel::documentInBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(runtime->NewNumber(0));
}
CJS_Return CJX_HostPseudoModel::resetData(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() > 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -404,7 +404,7 @@
}
CJS_Return CJX_HostPseudoModel::beep(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!GetDocument()->GetScriptContext()->IsRunAtClient())
return CJS_Return(true);
@@ -425,7 +425,7 @@
}
CJS_Return CJX_HostPseudoModel::setFocus(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!GetDocument()->GetScriptContext()->IsRunAtClient())
return CJS_Return(true);
@@ -468,7 +468,7 @@
}
CJS_Return CJX_HostPseudoModel::getFocus(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (!pNotify)
@@ -487,7 +487,7 @@
}
CJS_Return CJX_HostPseudoModel::messageBox(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!GetDocument()->GetScriptContext()->IsRunAtClient())
return CJS_Return(true);
@@ -527,13 +527,13 @@
}
CJS_Return CJX_HostPseudoModel::documentCountInBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(runtime->NewNumber(0));
}
CJS_Return CJX_HostPseudoModel::print(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!GetDocument()->GetScriptContext()->IsRunAtClient())
return CJS_Return(true);
@@ -568,7 +568,7 @@
}
CJS_Return CJX_HostPseudoModel::importData(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -577,7 +577,7 @@
}
CJS_Return CJX_HostPseudoModel::exportData(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -599,7 +599,7 @@
}
CJS_Return CJX_HostPseudoModel::pageUp(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (!pNotify)
@@ -617,7 +617,7 @@
}
CJS_Return CJX_HostPseudoModel::pageDown(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_FFNotify* pNotify = GetDocument()->GetNotify();
if (!pNotify)
diff --git a/fxjs/xfa/cjx_instancemanager.cpp b/fxjs/xfa/cjx_instancemanager.cpp
index 830541e..081b685 100644
--- a/fxjs/xfa/cjx_instancemanager.cpp
+++ b/fxjs/xfa/cjx_instancemanager.cpp
@@ -133,7 +133,7 @@
}
CJS_Return CJX_InstanceManager::moveInstance(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -160,7 +160,7 @@
}
CJS_Return CJX_InstanceManager::removeInstance(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -200,7 +200,7 @@
}
CJS_Return CJX_InstanceManager::setInstances(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -210,7 +210,7 @@
}
CJS_Return CJX_InstanceManager::addInstance(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty() && params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -251,7 +251,7 @@
}
CJS_Return CJX_InstanceManager::insertInstance(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1 && params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
index ba17ed8..fd8c880 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -69,7 +69,7 @@
}
CJS_Return CJX_LayoutPseudoModel::HWXY(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params,
XFA_LAYOUTMODEL_HWXY layoutModel) {
if (params.empty() || params.size() > 3)
@@ -127,30 +127,30 @@
}
CJS_Return CJX_LayoutPseudoModel::h(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return HWXY(runtime, params, XFA_LAYOUTMODEL_H);
}
CJS_Return CJX_LayoutPseudoModel::w(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return HWXY(runtime, params, XFA_LAYOUTMODEL_W);
}
CJS_Return CJX_LayoutPseudoModel::x(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return HWXY(runtime, params, XFA_LAYOUTMODEL_X);
}
CJS_Return CJX_LayoutPseudoModel::y(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return HWXY(runtime, params, XFA_LAYOUTMODEL_Y);
}
-CJS_Return CJX_LayoutPseudoModel::NumberedPageCount(CJS_V8* runtime,
+CJS_Return CJX_LayoutPseudoModel::NumberedPageCount(CFX_V8* runtime,
bool bNumbered) {
CXFA_LayoutProcessor* pDocLayout = GetDocument()->GetDocLayout();
if (!pDocLayout)
@@ -175,13 +175,13 @@
}
CJS_Return CJX_LayoutPseudoModel::pageCount(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return NumberedPageCount(runtime, true);
}
CJS_Return CJX_LayoutPseudoModel::pageSpan(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -206,7 +206,7 @@
}
CJS_Return CJX_LayoutPseudoModel::page(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return PageInternals(runtime, params, false);
}
@@ -346,7 +346,7 @@
}
CJS_Return CJX_LayoutPseudoModel::pageContent(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 3)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -382,25 +382,25 @@
}
CJS_Return CJX_LayoutPseudoModel::absPageCount(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return NumberedPageCount(runtime, false);
}
CJS_Return CJX_LayoutPseudoModel::absPageCountInBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(runtime->NewNumber(0));
}
CJS_Return CJX_LayoutPseudoModel::sheetCountInBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(runtime->NewNumber(0));
}
CJS_Return CJX_LayoutPseudoModel::relayout(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
CXFA_Node* pRootNode = GetDocument()->GetRoot();
CXFA_Form* pFormRoot =
@@ -415,13 +415,13 @@
}
CJS_Return CJX_LayoutPseudoModel::absPageSpan(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return pageSpan(runtime, params);
}
CJS_Return CJX_LayoutPseudoModel::absPageInBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -429,7 +429,7 @@
}
CJS_Return CJX_LayoutPseudoModel::sheetInBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -437,31 +437,31 @@
}
CJS_Return CJX_LayoutPseudoModel::sheet(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return PageInternals(runtime, params, true);
}
CJS_Return CJX_LayoutPseudoModel::relayoutPageArea(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_LayoutPseudoModel::sheetCount(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return NumberedPageCount(runtime, false);
}
CJS_Return CJX_LayoutPseudoModel::absPage(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return PageInternals(runtime, params, true);
}
CJS_Return CJX_LayoutPseudoModel::PageInternals(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params,
bool bAbsPage) {
if (params.size() != 1)
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.h b/fxjs/xfa/cjx_layoutpseudomodel.h
index 6dbef60..ecacdd1 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.h
+++ b/fxjs/xfa/cjx_layoutpseudomodel.h
@@ -52,15 +52,15 @@
JS_PROP(ready);
private:
- CJS_Return NumberedPageCount(CJS_V8* runtime, bool bNumbered);
- CJS_Return HWXY(CJS_V8* runtime,
+ CJS_Return NumberedPageCount(CFX_V8* runtime, bool bNumbered);
+ CJS_Return HWXY(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params,
XFA_LAYOUTMODEL_HWXY layoutModel);
std::vector<CXFA_Node*> GetObjArray(CXFA_LayoutProcessor* pDocLayout,
int32_t iPageNo,
const WideString& wsType,
bool bOnPageArea);
- CJS_Return PageInternals(CJS_V8* runtime,
+ CJS_Return PageInternals(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params,
bool bAbsPage);
diff --git a/fxjs/xfa/cjx_list.cpp b/fxjs/xfa/cjx_list.cpp
index 27a4315..4340e3b 100644
--- a/fxjs/xfa/cjx_list.cpp
+++ b/fxjs/xfa/cjx_list.cpp
@@ -31,7 +31,7 @@
return static_cast<CXFA_List*>(GetXFAObject());
}
-CJS_Return CJX_List::append(CJS_V8* runtime,
+CJS_Return CJX_List::append(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -45,7 +45,7 @@
return CJS_Return(true);
}
-CJS_Return CJX_List::insert(CJS_V8* runtime,
+CJS_Return CJX_List::insert(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -61,7 +61,7 @@
return CJS_Return(true);
}
-CJS_Return CJX_List::remove(CJS_V8* runtime,
+CJS_Return CJX_List::remove(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -75,7 +75,7 @@
return CJS_Return(true);
}
-CJS_Return CJX_List::item(CJS_V8* runtime,
+CJS_Return CJX_List::item(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_logpseudomodel.cpp b/fxjs/xfa/cjx_logpseudomodel.cpp
index 810ddfa..446c937 100644
--- a/fxjs/xfa/cjx_logpseudomodel.cpp
+++ b/fxjs/xfa/cjx_logpseudomodel.cpp
@@ -26,31 +26,31 @@
CJX_LogPseudoModel::~CJX_LogPseudoModel() {}
CJS_Return CJX_LogPseudoModel::message(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_LogPseudoModel::traceEnabled(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_LogPseudoModel::traceActivate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_LogPseudoModel::traceDeactivate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_LogPseudoModel::trace(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
diff --git a/fxjs/xfa/cjx_manifest.cpp b/fxjs/xfa/cjx_manifest.cpp
index 86e2926..642f4ca 100644
--- a/fxjs/xfa/cjx_manifest.cpp
+++ b/fxjs/xfa/cjx_manifest.cpp
@@ -22,7 +22,7 @@
CJX_Manifest::~CJX_Manifest() {}
CJS_Return CJX_Manifest::evaluate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_model.cpp b/fxjs/xfa/cjx_model.cpp
index aa5d6b2..857d6a4 100644
--- a/fxjs/xfa/cjx_model.cpp
+++ b/fxjs/xfa/cjx_model.cpp
@@ -26,13 +26,13 @@
CJX_Model::~CJX_Model() {}
CJS_Return CJX_Model::clearErrorList(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
return CJS_Return(true);
}
CJS_Return CJX_Model::createNode(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 3)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -70,7 +70,7 @@
}
CJS_Return CJX_Model::isCompatibleNS(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
index 8c49b6f..b1749d6 100644
--- a/fxjs/xfa/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -109,7 +109,7 @@
return static_cast<const CXFA_Node*>(GetXFAObject());
}
-CJS_Return CJX_Node::applyXSL(CJS_V8* runtime,
+CJS_Return CJX_Node::applyXSL(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -119,7 +119,7 @@
}
CJS_Return CJX_Node::assignNode(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 3)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -128,7 +128,7 @@
return CJS_Return(true);
}
-CJS_Return CJX_Node::clone(CJS_V8* runtime,
+CJS_Return CJX_Node::clone(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -142,7 +142,7 @@
}
CJS_Return CJX_Node::getAttribute(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -153,7 +153,7 @@
}
CJS_Return CJX_Node::getElement(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -174,7 +174,7 @@
}
CJS_Return CJX_Node::isPropertySpecified(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 3)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -197,7 +197,7 @@
return CJS_Return(runtime->NewBoolean(bHas));
}
-CJS_Return CJX_Node::loadXML(CJS_V8* runtime,
+CJS_Return CJX_Node::loadXML(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 3)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -318,13 +318,13 @@
}
CJS_Return CJX_Node::saveFilteredXML(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
// TODO(weili): Check whether we need to implement this, pdfium:501.
return CJS_Return(true);
}
-CJS_Return CJX_Node::saveXML(CJS_V8* runtime,
+CJS_Return CJX_Node::saveXML(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() > 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -366,7 +366,7 @@
}
CJS_Return CJX_Node::setAttribute(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -378,7 +378,7 @@
}
CJS_Return CJX_Node::setElement(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1 && params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index deedebc..e21a3ef 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -20,7 +20,7 @@
#include "xfa/fxfa/fxfa_basic.h"
class CFXJSE_Value;
-class CJS_V8;
+class CFX_V8;
class CXFA_CalcData;
class CXFA_Document;
class CXFA_LayoutItem;
@@ -30,7 +30,7 @@
typedef CJS_Return (*CJX_MethodCall)(
CJX_Object* obj,
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params);
struct CJX_MethodSpec {
const char* pName;
diff --git a/fxjs/xfa/cjx_packet.cpp b/fxjs/xfa/cjx_packet.cpp
index fdebe62..80b391c 100644
--- a/fxjs/xfa/cjx_packet.cpp
+++ b/fxjs/xfa/cjx_packet.cpp
@@ -24,7 +24,7 @@
CJX_Packet::~CJX_Packet() {}
CJS_Return CJX_Packet::getAttribute(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -40,7 +40,7 @@
}
CJS_Return CJX_Packet::setAttribute(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -54,7 +54,7 @@
}
CJS_Return CJX_Packet::removeAttribute(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_signaturepseudomodel.cpp b/fxjs/xfa/cjx_signaturepseudomodel.cpp
index 202532c..3041778 100644
--- a/fxjs/xfa/cjx_signaturepseudomodel.cpp
+++ b/fxjs/xfa/cjx_signaturepseudomodel.cpp
@@ -27,7 +27,7 @@
CJX_SignaturePseudoModel::~CJX_SignaturePseudoModel() {}
CJS_Return CJX_SignaturePseudoModel::verifySignature(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 4)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -35,7 +35,7 @@
}
CJS_Return CJX_SignaturePseudoModel::sign(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() < 3 || params.size() > 7)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -43,7 +43,7 @@
}
CJS_Return CJX_SignaturePseudoModel::enumerate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -51,7 +51,7 @@
}
CJS_Return CJX_SignaturePseudoModel::clear(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.empty() || params.size() > 2)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_source.cpp b/fxjs/xfa/cjx_source.cpp
index 399a6c3..7576e77 100644
--- a/fxjs/xfa/cjx_source.cpp
+++ b/fxjs/xfa/cjx_source.cpp
@@ -37,7 +37,7 @@
CJX_Source::~CJX_Source() {}
-CJS_Return CJX_Source::next(CJS_V8* runtime,
+CJS_Return CJX_Source::next(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -45,14 +45,14 @@
}
CJS_Return CJX_Source::cancelBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::first(CJS_V8* runtime,
+CJS_Return CJX_Source::first(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -60,7 +60,7 @@
}
CJS_Return CJX_Source::updateBatch(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -68,42 +68,42 @@
}
CJS_Return CJX_Source::previous(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::isBOF(CJS_V8* runtime,
+CJS_Return CJX_Source::isBOF(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::isEOF(CJS_V8* runtime,
+CJS_Return CJX_Source::isEOF(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::cancel(CJS_V8* runtime,
+CJS_Return CJX_Source::cancel(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::update(CJS_V8* runtime,
+CJS_Return CJX_Source::update(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::open(CJS_V8* runtime,
+CJS_Return CJX_Source::open(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -111,14 +111,14 @@
}
CJS_Return CJX_Source::deleteItem(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::addNew(CJS_V8* runtime,
+CJS_Return CJX_Source::addNew(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -126,28 +126,28 @@
}
CJS_Return CJX_Source::requery(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::resync(CJS_V8* runtime,
+CJS_Return CJX_Source::resync(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::close(CJS_V8* runtime,
+CJS_Return CJX_Source::close(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
return CJS_Return(true);
}
-CJS_Return CJX_Source::last(CJS_V8* runtime,
+CJS_Return CJX_Source::last(CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -155,7 +155,7 @@
}
CJS_Return CJX_Source::hasDataChanged(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_subform.cpp b/fxjs/xfa/cjx_subform.cpp
index f153fa2..52f0865 100644
--- a/fxjs/xfa/cjx_subform.cpp
+++ b/fxjs/xfa/cjx_subform.cpp
@@ -29,7 +29,7 @@
CJX_Subform::~CJX_Subform() {}
CJS_Return CJX_Subform::execEvent(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -40,7 +40,7 @@
}
CJS_Return CJX_Subform::execInitialize(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -53,7 +53,7 @@
}
CJS_Return CJX_Subform::execCalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -66,7 +66,7 @@
}
CJS_Return CJX_Subform::execValidate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_template.cpp b/fxjs/xfa/cjx_template.cpp
index d909567..6612a7c 100644
--- a/fxjs/xfa/cjx_template.cpp
+++ b/fxjs/xfa/cjx_template.cpp
@@ -28,7 +28,7 @@
CJX_Template::~CJX_Template() {}
CJS_Return CJX_Template::formNodes(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -36,7 +36,7 @@
}
CJS_Return CJX_Template::remerge(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -46,7 +46,7 @@
}
CJS_Return CJX_Template::execInitialize(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -54,7 +54,7 @@
}
CJS_Return CJX_Template::recalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -62,7 +62,7 @@
}
CJS_Return CJX_Template::execCalculate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -70,7 +70,7 @@
}
CJS_Return CJX_Template::execValidate(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty())
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp
index c11d77b..219953d 100644
--- a/fxjs/xfa/cjx_tree.cpp
+++ b/fxjs/xfa/cjx_tree.cpp
@@ -30,7 +30,7 @@
CJX_Tree::~CJX_Tree() {}
CJS_Return CJX_Tree::resolveNode(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
@@ -79,7 +79,7 @@
}
CJS_Return CJX_Tree::resolveNodes(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_treelist.cpp b/fxjs/xfa/cjx_treelist.cpp
index b91a0b7..904e093 100644
--- a/fxjs/xfa/cjx_treelist.cpp
+++ b/fxjs/xfa/cjx_treelist.cpp
@@ -29,7 +29,7 @@
}
CJS_Return CJX_TreeList::namedItem(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
diff --git a/fxjs/xfa/cjx_wsdlconnection.cpp b/fxjs/xfa/cjx_wsdlconnection.cpp
index 4c6ca46..1f9ae59 100644
--- a/fxjs/xfa/cjx_wsdlconnection.cpp
+++ b/fxjs/xfa/cjx_wsdlconnection.cpp
@@ -23,7 +23,7 @@
CJX_WsdlConnection::~CJX_WsdlConnection() {}
CJS_Return CJX_WsdlConnection::execute(
- CJS_V8* runtime,
+ CFX_V8* runtime,
const std::vector<v8::Local<v8::Value>>& params) {
if (!params.empty() && params.size() != 1)
return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
