summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fpdfsdk/include/jsapi/fxjs_v8.h28
-rw-r--r--fpdfsdk/src/jsapi/fxjs_v8.cpp43
2 files changed, 12 insertions, 59 deletions
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index e455bfc4ae..3499bfbfea 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -116,30 +116,37 @@ int FXJS_Execute(v8::Isolate* pIsolate,
v8::Local<v8::Object> FXJS_NewFxDynamicObj(v8::Isolate* pIsolate,
IFXJS_Context* pJSContext,
int nObjDefnID);
-v8::Local<v8::Object> FXJS_GetStaticObj(v8::Isolate* pIsolate, int nObjDefnID);
v8::Local<v8::Object> FXJS_GetThisObj(v8::Isolate* pIsolate);
int FXJS_GetObjDefnID(v8::Local<v8::Object> pObj);
-v8::Isolate* FXJS_GetRuntime(v8::Local<v8::Object> pObj);
int FXJS_GetObjDefnID(v8::Isolate* pIsolate, const wchar_t* pObjName);
-void FXJS_Error(v8::Isolate* isolate, const CFX_WideString& message);
+v8::Isolate* FXJS_GetRuntime(v8::Local<v8::Object> pObj);
const wchar_t* FXJS_GetTypeof(v8::Local<v8::Value> pObj);
+
void FXJS_SetPrivate(v8::Isolate* pIsolate,
v8::Local<v8::Object> pObj,
void* p);
-void* FXJS_GetPrivate(v8::Isolate* pIsolate, v8::Local<v8::Object> pObj);
void FXJS_SetPrivate(v8::Local<v8::Object> pObj, void* p);
+void* FXJS_GetPrivate(v8::Isolate* pIsolate, v8::Local<v8::Object> pObj);
void* FXJS_GetPrivate(v8::Local<v8::Object> pObj);
void FXJS_FreePrivate(void* p);
void FXJS_FreePrivate(v8::Local<v8::Object> pObj);
+
+void FXJS_Error(v8::Isolate* isolate, const CFX_WideString& message);
v8::Local<v8::String> FXJS_WSToJSString(v8::Isolate* pIsolate,
const wchar_t* PropertyName,
int Len = -1);
-v8::Local<v8::Value> FXJS_GetObjectValue(v8::Local<v8::Object> pObj);
+
v8::Local<v8::Value> FXJS_GetObjectElement(v8::Isolate* pIsolate,
v8::Local<v8::Object> pObj,
const wchar_t* PropertyName);
v8::Local<v8::Array> FXJS_GetObjectElementNames(v8::Isolate* pIsolate,
v8::Local<v8::Object> pObj);
+
+v8::Local<v8::Value> FXJS_GetArrayElement(v8::Isolate* pIsolate,
+ v8::Local<v8::Array> pArray,
+ unsigned index);
+unsigned FXJS_GetArrayLength(v8::Local<v8::Array> pArray);
+
void FXJS_PutObjectString(v8::Isolate* pIsolate,
v8::Local<v8::Object> pObj,
const wchar_t* PropertyName,
@@ -171,13 +178,6 @@ unsigned FXJS_PutArrayElement(v8::Isolate* pIsolate,
v8::Local<v8::Array> pArray,
unsigned index,
v8::Local<v8::Value> pValue);
-v8::Local<v8::Value> FXJS_GetArrayElement(v8::Isolate* pIsolate,
- v8::Local<v8::Array> pArray,
- unsigned index);
-unsigned FXJS_GetArrayLength(v8::Local<v8::Array> pArray);
-v8::Local<v8::Value> FXJS_GetListValue(v8::Isolate* pIsolate,
- v8::Local<v8::Value> pList,
- int index);
v8::Local<v8::Array> FXJS_NewArray(v8::Isolate* pIsolate);
v8::Local<v8::Value> FXJS_NewNumber(v8::Isolate* pIsolate, int number);
@@ -190,12 +190,8 @@ v8::Local<v8::Value> FXJS_NewObject2(v8::Isolate* pIsolate,
v8::Local<v8::Array> pObj);
v8::Local<v8::Value> FXJS_NewString(v8::Isolate* pIsolate,
const wchar_t* string);
-v8::Local<v8::Value> FXJS_NewString(v8::Isolate* pIsolate,
- const wchar_t* string,
- unsigned nLen);
v8::Local<v8::Value> FXJS_NewNull();
v8::Local<v8::Value> FXJS_NewDate(v8::Isolate* pIsolate, double d);
-v8::Local<v8::Value> FXJS_NewValue(v8::Isolate* pIsolate);
int FXJS_ToInt32(v8::Isolate* pIsolate, v8::Local<v8::Value> pValue);
bool FXJS_ToBoolean(v8::Isolate* pIsolate, v8::Local<v8::Value> pValue);
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp
index 2c17628dbc..381bfbad7f 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp
@@ -416,20 +416,6 @@ v8::Local<v8::Object> FXJS_NewFxDynamicObj(v8::Isolate* pIsolate,
return obj;
}
-v8::Local<v8::Object> FXJS_GetStaticObj(v8::Isolate* pIsolate, int nObjDefnID) {
- v8::Isolate::Scope isolate_scope(pIsolate);
- CFX_PtrArray* pArray = (CFX_PtrArray*)pIsolate->GetData(g_embedderDataSlot);
- if (!pArray)
- return v8::Local<v8::Object>();
-
- if (nObjDefnID < 0 || nObjDefnID >= pArray->GetSize())
- return v8::Local<v8::Object>();
- CFXJS_ObjDefintion* pObjDef = (CFXJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
- v8::Local<v8::Object> obj =
- v8::Local<v8::Object>::New(pIsolate, pObjDef->m_StaticObj);
- return obj;
-}
-
v8::Local<v8::Object> FXJS_GetThisObj(v8::Isolate* pIsolate) {
// Return the global object.
v8::Isolate::Scope isolate_scope(pIsolate);
@@ -567,10 +553,6 @@ v8::Local<v8::String> FXJS_WSToJSString(v8::Isolate* pIsolate,
v8::NewStringType::kNormal).ToLocalChecked();
}
-v8::Local<v8::Value> FXJS_GetObjectValue(v8::Local<v8::Object> pObj) {
- return pObj;
-}
-
v8::Local<v8::Value> FXJS_GetObjectElement(v8::Isolate* pIsolate,
v8::Local<v8::Object> pObj,
const wchar_t* PropertyName) {
@@ -736,12 +718,6 @@ v8::Local<v8::Value> FXJS_NewString(v8::Isolate* pIsolate,
return FXJS_WSToJSString(pIsolate, string);
}
-v8::Local<v8::Value> FXJS_NewString(v8::Isolate* pIsolate,
- const wchar_t* string,
- unsigned nLen) {
- return FXJS_WSToJSString(pIsolate, string, nLen);
-}
-
v8::Local<v8::Value> FXJS_NewNull() {
return v8::Local<v8::Value>();
}
@@ -750,25 +726,6 @@ v8::Local<v8::Value> FXJS_NewDate(v8::Isolate* pIsolate, double d) {
return v8::Date::New(pIsolate->GetCurrentContext(), d).ToLocalChecked();
}
-v8::Local<v8::Value> FXJS_NewValue(v8::Isolate* pIsolate) {
- return v8::Local<v8::Value>();
-}
-
-v8::Local<v8::Value> FXJS_GetListValue(v8::Isolate* pIsolate,
- v8::Local<v8::Value> pList,
- int index) {
- v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
- if (!pList.IsEmpty() && pList->IsObject()) {
- v8::Local<v8::Object> obj;
- if (pList->ToObject(context).ToLocal(&obj)) {
- v8::Local<v8::Value> val;
- if (obj->Get(context, index).ToLocal(&val))
- return val;
- }
- }
- return v8::Local<v8::Value>();
-}
-
int FXJS_ToInt32(v8::Isolate* pIsolate, v8::Local<v8::Value> pValue) {
if (pValue.IsEmpty())
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:33:18 +0000