Index: fpdfsdk/src/jsapi/fxjs_v8.cpp |
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp |
index b1adeb7112c08f1bfd2e0a6ecff606b517694dca..0c0d8b5b1b1eb612ce13e305d1b0ae06af30a991 100644 |
--- a/fpdfsdk/src/jsapi/fxjs_v8.cpp |
+++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp |
@@ -46,7 +46,7 @@ public: |
v8::Isolate::Scope isolate_scope(isolate); |
v8::HandleScope handle_scope(isolate); |
- v8::Handle<v8::ObjectTemplate> objTemplate = v8::ObjectTemplate::New(isolate); |
+ v8::Local<v8::ObjectTemplate> objTemplate = v8::ObjectTemplate::New(isolate); |
objTemplate->SetInternalFieldCount(2); |
m_objTemplate.Reset(isolate, objTemplate); |
@@ -70,8 +70,8 @@ public: |
unsigned m_bApplyNew; |
FX_BOOL m_bSetAsGlobalObject; |
- v8::Persistent<v8::ObjectTemplate> m_objTemplate; |
- v8::Persistent<v8::Object> m_StaticObj; |
+ v8::Global<v8::ObjectTemplate> m_objTemplate; |
+ v8::Global<v8::Object> m_StaticObj; |
}; |
int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew) |
@@ -147,7 +147,7 @@ int JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::Named |
return 0; |
} |
-int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sConstName, v8::Handle<v8::Value> pDefault) |
+int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sConstName, v8::Local<v8::Value> pDefault) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
@@ -167,7 +167,7 @@ int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sC |
return 0; |
} |
-static v8::Persistent<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* pJSRuntime) |
+static v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* pJSRuntime) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
@@ -181,7 +181,7 @@ static v8::Persistent<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* |
if(pObjDef->m_bSetAsGlobalObject) |
return pObjDef->m_objTemplate; |
} |
- static v8::Persistent<v8::ObjectTemplate> gloabalObjectTemplate; |
+ static v8::Global<v8::ObjectTemplate> gloabalObjectTemplate; |
return gloabalObjectTemplate; |
} |
@@ -197,7 +197,7 @@ int JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, v |
v8::Local<v8::FunctionTemplate> funTempl = v8::FunctionTemplate::New(isolate, pMethodCall); |
v8::Local<v8::ObjectTemplate> objTemp; |
- v8::Persistent<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime); |
+ v8::Global<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime); |
if(globalObjTemp.IsEmpty()) |
objTemp = v8::ObjectTemplate::New(isolate); |
else |
@@ -209,7 +209,7 @@ int JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, v |
return 0; |
} |
-int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Handle<v8::Value> pDefault) |
+int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Local<v8::Value> pDefault) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
@@ -220,7 +220,7 @@ int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8: |
v8::Local<v8::ObjectTemplate> objTemp; |
- v8::Persistent<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime); |
+ v8::Global<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime); |
if(globalObjTemp.IsEmpty()) |
objTemp = v8::ObjectTemplate::New(isolate); |
else |
@@ -233,17 +233,17 @@ int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8: |
} |
-void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Persistent<v8::Context>& v8PersistentContext) |
+void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Global<v8::Context>& v8PersistentContext) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
v8::HandleScope handle_scope(isolate); |
- v8::Persistent<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime); |
- v8::Handle<v8::Context> v8Context = v8::Context::New(isolate, NULL, v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp)); |
+ v8::Global<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime); |
+ v8::Local<v8::Context> v8Context = v8::Context::New(isolate, NULL, v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp)); |
v8::Context::Scope context_scope(v8Context); |
- v8::Handle<v8::External> ptr = v8::External::New(isolate, pFXRuntime); |
+ v8::Local<v8::External> ptr = v8::External::New(isolate, pFXRuntime); |
v8Context->SetEmbedderData(1, ptr); |
CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0); |
@@ -254,7 +254,7 @@ void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_ |
CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(i); |
CFX_WideString ws = CFX_WideString(pObjDef->objName); |
CFX_ByteString bs = ws.UTF8Encode(); |
- v8::Handle<v8::String> objName = v8::String::NewFromUtf8(isolate, bs.c_str(), v8::NewStringType::kNormal, bs.GetLength()).ToLocalChecked(); |
+ v8::Local<v8::String> objName = v8::String::NewFromUtf8(isolate, bs.c_str(), v8::NewStringType::kNormal, bs.GetLength()).ToLocalChecked(); |
if(pObjDef->objType == JS_DYNAMIC) |
@@ -274,7 +274,7 @@ void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_ |
} |
else |
{ |
- v8::Handle<v8::Object> obj = JS_NewFxDynamicObj(pJSRuntime, context, i); |
+ v8::Local<v8::Object> obj = JS_NewFxDynamicObj(pJSRuntime, context, i); |
v8Context->Global()->Set(v8Context, objName, obj).FromJust(); |
pObjDef->m_StaticObj.Reset(isolate, obj); |
} |
@@ -282,7 +282,7 @@ void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_ |
v8PersistentContext.Reset(isolate, v8Context); |
} |
-void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Persistent<v8::Context>& v8PersistentContext) |
+void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Global<v8::Context>& v8PersistentContext) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
@@ -351,7 +351,7 @@ int JS_Execute(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t |
return -1; |
} |
- v8::Handle<v8::Value> result; |
+ v8::Local<v8::Value> result; |
if (!compiled_script->Run(context).ToLocal(&result)) { |
v8::String::Utf8Value error(try_catch.Exception()); |
return -1; |
@@ -359,7 +359,7 @@ int JS_Execute(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t |
return 0; |
} |
-v8::Handle<v8::Object> JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, int nObjDefnID) |
+v8::Local<v8::Object> JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, int nObjDefnID) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
@@ -369,14 +369,14 @@ v8::Handle<v8::Object> JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context |
v8::Local<v8::ObjectTemplate> objTempl = v8::ObjectTemplate::New(isolate); |
v8::Local<v8::Object> obj; |
if (objTempl->NewInstance(context).ToLocal(&obj)) return obj; |
- return v8::Handle<v8::Object>(); |
+ return v8::Local<v8::Object>(); |
} |
CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0); |
- if(!pArray) return v8::Handle<v8::Object>(); |
+ if(!pArray) return v8::Local<v8::Object>(); |
- if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return v8::Handle<v8::Object>(); |
+ if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return v8::Local<v8::Object>(); |
CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID); |
v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate); |
@@ -393,15 +393,15 @@ v8::Handle<v8::Object> JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context |
return obj; |
} |
-v8::Handle<v8::Object> JS_GetStaticObj(IJS_Runtime* pJSRuntime, int nObjDefnID) |
+v8::Local<v8::Object> JS_GetStaticObj(IJS_Runtime* pJSRuntime, int nObjDefnID) |
{ |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0); |
- if(!pArray) return v8::Handle<v8::Object>(); |
+ if(!pArray) return v8::Local<v8::Object>(); |
- if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return v8::Handle<v8::Object>(); |
+ if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return v8::Local<v8::Object>(); |
CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID); |
v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(isolate,pObjDef->m_StaticObj); |
return obj; |
@@ -411,20 +411,20 @@ void JS_SetThisObj(IJS_Runtime* pJSRuntime, int nThisObjID) |
{ |
//Do nothing. |
} |
-v8::Handle<v8::Object> JS_GetThisObj(IJS_Runtime * pJSRuntime) |
+v8::Local<v8::Object> JS_GetThisObj(IJS_Runtime * pJSRuntime) |
{ |
//Return the global object. |
v8::Isolate* isolate = (v8::Isolate*)pJSRuntime; |
v8::Isolate::Scope isolate_scope(isolate); |
CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0); |
- if(!pArray) return v8::Handle<v8::Object>(); |
+ if(!pArray) return v8::Local<v8::Object>(); |
v8::Local<v8::Context> context = isolate->GetCurrentContext(); |
return context->Global()->GetPrototype()->ToObject(context).ToLocalChecked(); |
} |
-int JS_GetObjDefnID(v8::Handle<v8::Object> pObj) |
+int JS_GetObjDefnID(v8::Local<v8::Object> pObj) |
{ |
if(pObj.IsEmpty() || !pObj->InternalFieldCount()) return -1; |
CJS_PrivateData* pPrivateData = (CJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0); |
@@ -433,7 +433,7 @@ int JS_GetObjDefnID(v8::Handle<v8::Object> pObj) |
return -1; |
} |
-IJS_Runtime* JS_GetRuntime(v8::Handle<v8::Object> pObj) |
+IJS_Runtime* JS_GetRuntime(v8::Local<v8::Object> pObj) |
{ |
if(pObj.IsEmpty()) return NULL; |
v8::Local<v8::Context> context = pObj->CreationContext(); |
@@ -478,7 +478,7 @@ unsigned JS_CalcHash(const wchar_t* main) |
{ |
return (unsigned)FX_HashCode_String_GetW(main, FXSYS_wcslen(main)); |
} |
-const wchar_t* JS_GetTypeof(v8::Handle<v8::Value> pObj) |
+const wchar_t* JS_GetTypeof(v8::Local<v8::Value> pObj) |
{ |
if(pObj.IsEmpty()) return NULL; |
if(pObj->IsString()) |
@@ -498,17 +498,17 @@ const wchar_t* JS_GetTypeof(v8::Handle<v8::Value> pObj) |
return NULL; |
} |
-void JS_SetPrivate(v8::Handle<v8::Object> pObj, void* p) |
+void JS_SetPrivate(v8::Local<v8::Object> pObj, void* p) |
{ |
JS_SetPrivate(NULL, pObj, p); |
} |
-void* JS_GetPrivate(v8::Handle<v8::Object> pObj) |
+void* JS_GetPrivate(v8::Local<v8::Object> pObj) |
{ |
return JS_GetPrivate(NULL,pObj); |
} |
-void JS_SetPrivate(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj, void* p) |
+void JS_SetPrivate(IJS_Runtime* pJSRuntime, v8::Local<v8::Object> pObj, void* p) |
{ |
if(pObj.IsEmpty() || !pObj->InternalFieldCount()) return; |
CJS_PrivateData* pPrivateData = (CJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0); |
@@ -516,7 +516,7 @@ void JS_SetPrivate(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj, void* p |
pPrivateData->pPrivate = p; |
} |
-void* JS_GetPrivate(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj) |
+void* JS_GetPrivate(IJS_Runtime* pJSRuntime, v8::Local<v8::Object> pObj) |
{ |
if(pObj.IsEmpty()) return NULL; |
CJS_PrivateData* pPrivateData = NULL; |
@@ -540,7 +540,7 @@ void JS_FreePrivate(void* pPrivateData) |
delete (CJS_PrivateData*)pPrivateData; |
} |
-void JS_FreePrivate(v8::Handle<v8::Object> pObj) |
+void JS_FreePrivate(v8::Local<v8::Object> pObj) |
{ |
if(pObj.IsEmpty() || !pObj->InternalFieldCount()) return; |
JS_FreePrivate(pObj->GetAlignedPointerFromInternalField(0)); |
@@ -548,12 +548,12 @@ void JS_FreePrivate(v8::Handle<v8::Object> pObj) |
} |
-v8::Handle<v8::Value> JS_GetObjectValue(v8::Handle<v8::Object> pObj) |
+v8::Local<v8::Value> JS_GetObjectValue(v8::Local<v8::Object> pObj) |
{ |
return pObj; |
} |
-v8::Handle<v8::String> WSToJSString(IJS_Runtime* pJSRuntime, const wchar_t* PropertyName, int Len = -1) |
+v8::Local<v8::String> WSToJSString(IJS_Runtime* pJSRuntime, const wchar_t* PropertyName, int Len = -1) |
{ |
CFX_WideString ws = CFX_WideString(PropertyName,Len); |
CFX_ByteString bs = ws.UTF8Encode(); |
@@ -561,149 +561,149 @@ v8::Handle<v8::String> WSToJSString(IJS_Runtime* pJSRuntime, const wchar_t* Prop |
return v8::String::NewFromUtf8(pJSRuntime, bs.c_str(), v8::NewStringType::kNormal).ToLocalChecked(); |
} |
-v8::Handle<v8::Value> JS_GetObjectElement(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj,const wchar_t* PropertyName) |
+v8::Local<v8::Value> JS_GetObjectElement(IJS_Runtime* pJSRuntime, v8::Local<v8::Object> pObj,const wchar_t* PropertyName) |
{ |
- if(pObj.IsEmpty()) return v8::Handle<v8::Value>(); |
+ if(pObj.IsEmpty()) return v8::Local<v8::Value>(); |
v8::Local<v8::Value> val; |
- if (!pObj->Get(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName)).ToLocal(&val)) return v8::Handle<v8::Value>(); |
+ if (!pObj->Get(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName)).ToLocal(&val)) return v8::Local<v8::Value>(); |
return val; |
} |
-v8::Handle<v8::Array> JS_GetObjectElementNames(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj) |
+v8::Local<v8::Array> JS_GetObjectElementNames(IJS_Runtime* pJSRuntime, v8::Local<v8::Object> pObj) |
{ |
- if(pObj.IsEmpty()) return v8::Handle<v8::Array>(); |
+ if(pObj.IsEmpty()) return v8::Local<v8::Array>(); |
v8::Local<v8::Array> val; |
if (!pObj->GetPropertyNames(pJSRuntime->GetCurrentContext()).ToLocal(&val)) return v8::Local<v8::Array>(); |
return val; |
} |
-void JS_PutObjectString(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, const wchar_t* sValue) //VT_string |
+void JS_PutObjectString(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName, const wchar_t* sValue) //VT_string |
{ |
if(pObj.IsEmpty()) return; |
pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime, PropertyName), WSToJSString(pJSRuntime, sValue)).FromJust(); |
} |
-void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, int nValue) |
+void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName, int nValue) |
{ |
if(pObj.IsEmpty()) return; |
pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Int32::New(pJSRuntime, nValue)).FromJust(); |
} |
-void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, float fValue) |
+void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName, float fValue) |
{ |
if(pObj.IsEmpty()) return; |
pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Number::New(pJSRuntime, (double)fValue)).FromJust(); |
} |
-void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, double dValue) |
+void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName, double dValue) |
{ |
if(pObj.IsEmpty()) return; |
pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Number::New(pJSRuntime, (double)dValue)).FromJust(); |
} |
-void JS_PutObjectBoolean(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, bool bValue) |
+void JS_PutObjectBoolean(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName, bool bValue) |
{ |
if(pObj.IsEmpty()) return; |
pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Boolean::New(pJSRuntime, bValue)).FromJust(); |
} |
-void JS_PutObjectObject(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, v8::Handle<v8::Object> pPut) |
+void JS_PutObjectObject(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName, v8::Local<v8::Object> pPut) |
{ |
if(pObj.IsEmpty()) return; |
pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),pPut).FromJust(); |
} |
-void JS_PutObjectNull(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName) |
+void JS_PutObjectNull(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj, const wchar_t* PropertyName) |
{ |
if(pObj.IsEmpty()) return; |
- pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Handle<v8::Object>()).FromJust(); |
+ pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Local<v8::Object>()).FromJust(); |
} |
-v8::Handle<v8::Array> JS_NewArray(IJS_Runtime* pJSRuntime) |
+v8::Local<v8::Array> JS_NewArray(IJS_Runtime* pJSRuntime) |
{ |
return v8::Array::New(pJSRuntime); |
} |
-unsigned JS_PutArrayElement(IJS_Runtime* pJSRuntime, v8::Handle<v8::Array> pArray,unsigned index,v8::Handle<v8::Value> pValue,FXJSVALUETYPE eType) |
+unsigned JS_PutArrayElement(IJS_Runtime* pJSRuntime, v8::Local<v8::Array> pArray,unsigned index,v8::Local<v8::Value> pValue,FXJSVALUETYPE eType) |
{ |
if(pArray.IsEmpty()) return 0; |
if (pArray->Set(pJSRuntime->GetCurrentContext(), index, pValue).IsNothing()) return 0; |
return 1; |
} |
-v8::Handle<v8::Value> JS_GetArrayElement(IJS_Runtime* pJSRuntime, v8::Handle<v8::Array> pArray,unsigned index) |
+v8::Local<v8::Value> JS_GetArrayElement(IJS_Runtime* pJSRuntime, v8::Local<v8::Array> pArray,unsigned index) |
{ |
- if(pArray.IsEmpty()) return v8::Handle<v8::Value>(); |
+ if(pArray.IsEmpty()) return v8::Local<v8::Value>(); |
v8::Local<v8::Value> val; |
if (pArray->Get(pJSRuntime->GetCurrentContext(), index).ToLocal(&val)) return v8::Local<v8::Value>(); |
return val; |
} |
-unsigned JS_GetArrayLength(v8::Handle<v8::Array> pArray) |
+unsigned JS_GetArrayLength(v8::Local<v8::Array> pArray) |
{ |
if(pArray.IsEmpty()) return 0; |
return pArray->Length(); |
} |
-v8::Handle<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,int number) |
+v8::Local<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,int number) |
{ |
return v8::Int32::New(pJSRuntime, number); |
} |
-v8::Handle<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,double number) |
+v8::Local<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,double number) |
{ |
return v8::Number::New(pJSRuntime, number); |
} |
-v8::Handle<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,float number) |
+v8::Local<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,float number) |
{ |
return v8::Number::New(pJSRuntime, (float)number); |
} |
-v8::Handle<v8::Value> JS_NewBoolean(IJS_Runtime* pJSRuntime,bool b) |
+v8::Local<v8::Value> JS_NewBoolean(IJS_Runtime* pJSRuntime,bool b) |
{ |
return v8::Boolean::New(pJSRuntime, b); |
} |
-v8::Handle<v8::Value> JS_NewObject(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj) |
+v8::Local<v8::Value> JS_NewObject(IJS_Runtime* pJSRuntime,v8::Local<v8::Object> pObj) |
{ |
- if(pObj.IsEmpty()) return v8::Handle<v8::Value>(); |
+ if(pObj.IsEmpty()) return v8::Local<v8::Value>(); |
return pObj->Clone(); |
} |
-v8::Handle<v8::Value> JS_NewObject2(IJS_Runtime* pJSRuntime,v8::Handle<v8::Array> pObj) |
+v8::Local<v8::Value> JS_NewObject2(IJS_Runtime* pJSRuntime,v8::Local<v8::Array> pObj) |
{ |
- if(pObj.IsEmpty()) return v8::Handle<v8::Value>(); |
+ if(pObj.IsEmpty()) return v8::Local<v8::Value>(); |
return pObj->Clone(); |
} |
-v8::Handle<v8::Value> JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string) |
+v8::Local<v8::Value> JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string) |
{ |
return WSToJSString(pJSRuntime, string); |
} |
-v8::Handle<v8::Value> JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string, unsigned nLen) |
+v8::Local<v8::Value> JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string, unsigned nLen) |
{ |
return WSToJSString(pJSRuntime, string, nLen); |
} |
-v8::Handle<v8::Value> JS_NewNull() |
+v8::Local<v8::Value> JS_NewNull() |
{ |
- return v8::Handle<v8::Value>(); |
+ return v8::Local<v8::Value>(); |
} |
-v8::Handle<v8::Value> JS_NewDate(IJS_Runtime* pJSRuntime,double d) |
+v8::Local<v8::Value> JS_NewDate(IJS_Runtime* pJSRuntime,double d) |
{ |
return v8::Date::New(pJSRuntime->GetCurrentContext(), d).ToLocalChecked(); |
} |
-v8::Handle<v8::Value> JS_NewValue(IJS_Runtime* pJSRuntime) |
+v8::Local<v8::Value> JS_NewValue(IJS_Runtime* pJSRuntime) |
{ |
- return v8::Handle<v8::Value>(); |
+ return v8::Local<v8::Value>(); |
} |
-v8::Handle<v8::Value> JS_GetListValue(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pList, int index) |
+v8::Local<v8::Value> JS_GetListValue(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pList, int index) |
{ |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
@@ -716,38 +716,38 @@ v8::Handle<v8::Value> JS_GetListValue(IJS_Runtime* pJSRuntime, v8::Handle<v8::Va |
if (obj->Get(context, index).ToLocal(&val)) return val; |
} |
} |
- return v8::Handle<v8::Value>(); |
+ return v8::Local<v8::Value>(); |
} |
-int JS_ToInt32(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue) |
+int JS_ToInt32(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pValue) |
{ |
if(pValue.IsEmpty()) return 0; |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
return pValue->ToInt32(context).ToLocalChecked()->Value(); |
} |
-bool JS_ToBoolean(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue) |
+bool JS_ToBoolean(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pValue) |
{ |
if(pValue.IsEmpty()) return false; |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
return pValue->ToBoolean(context).ToLocalChecked()->Value(); |
} |
-double JS_ToNumber(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue) |
+double JS_ToNumber(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pValue) |
{ |
if(pValue.IsEmpty()) return 0.0; |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
return pValue->ToNumber(context).ToLocalChecked()->Value(); |
} |
-v8::Handle<v8::Object> JS_ToObject(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue) |
+v8::Local<v8::Object> JS_ToObject(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pValue) |
{ |
- if(pValue.IsEmpty()) return v8::Handle<v8::Object>(); |
+ if(pValue.IsEmpty()) return v8::Local<v8::Object>(); |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
return pValue->ToObject(context).ToLocalChecked(); |
} |
-CFX_WideString JS_ToString(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue) |
+CFX_WideString JS_ToString(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pValue) |
{ |
if(pValue.IsEmpty()) return L""; |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
@@ -755,14 +755,14 @@ CFX_WideString JS_ToString(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue |
return CFX_WideString::FromUTF8(*s, s.length()); |
} |
-v8::Handle<v8::Array> JS_ToArray(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue) |
+v8::Local<v8::Array> JS_ToArray(IJS_Runtime* pJSRuntime, v8::Local<v8::Value> pValue) |
{ |
- if(pValue.IsEmpty()) return v8::Handle<v8::Array>(); |
+ if(pValue.IsEmpty()) return v8::Local<v8::Array>(); |
v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext(); |
- return v8::Handle<v8::Array>::Cast(pValue->ToObject(context).ToLocalChecked()); |
+ return v8::Local<v8::Array>::Cast(pValue->ToObject(context).ToLocalChecked()); |
} |
-void JS_ValueCopy(v8::Handle<v8::Value>& pTo, v8::Handle<v8::Value> pFrom) |
+void JS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom) |
{ |
pTo = pFrom; |
} |
@@ -1000,11 +1000,11 @@ double JS_DateParse(const wchar_t* string) |
v = o->Get(context,v8::String::NewFromUtf8(pIsolate, "parse", v8::NewStringType::kNormal).ToLocalChecked()).ToLocalChecked(); |
if(v->IsFunction()) |
{ |
- v8::Local<v8::Function> funC = v8::Handle<v8::Function>::Cast(v); |
+ v8::Local<v8::Function> funC = v8::Local<v8::Function>::Cast(v); |
const int argc = 1; |
v8::Local<v8::String> timeStr = WSToJSString(pIsolate, string); |
- v8::Handle<v8::Value> argv[argc] = {timeStr}; |
+ v8::Local<v8::Value> argv[argc] = {timeStr}; |
v = funC->Call(context, context->Global(), argc, argv).ToLocalChecked(); |
if(v->IsNumber()) |
{ |