From dfa2c9939a85ad1c01ef858b21942ab3773dcf27 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Tue, 19 May 2015 00:38:00 +0200 Subject: Merge V8 API updates to xfa branch Set pointers in internal fields directly instead of wrapping them Review URL: https://codereview.chromium.org/1139853003 Use phantom handles instead of weak handles Review URL: https://codereview.chromium.org/1129253004 Replace deprecated with non-deprecated V8 APIs Review URL: https://codereview.chromium.org/1126203010 Add myself to OWNERS file Review URL: https://codereview.chromium.org/1133333005 Replace v8::Handle with v8::Local and v8::Persistent with v8::Global Review URL: https://codereview.chromium.org/1138823004 TBR=tsepez@chromium.org BUG= Review URL: https://codereview.chromium.org/1140033004 --- fpdfsdk/include/javascript/JS_Define.h | 6 +- fpdfsdk/include/javascript/JS_Object.h | 3 +- fpdfsdk/include/javascript/JS_Runtime.h | 4 +- fpdfsdk/include/javascript/JS_Value.h | 28 ++++---- fpdfsdk/include/javascript/global.h | 6 +- fpdfsdk/include/jsapi/fxjs_v8.h | 113 ++++++++++++++++---------------- 6 files changed, 81 insertions(+), 79 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index e9475a03a2..8310ae25fb 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -69,7 +69,7 @@ void JSPropGetter(const char* prop_name_string, JS_Error(isolate, JSFormatErrorString(class_name_string, prop_name_string, sError)); return; } - info.GetReturnValue().Set((v8::Handle)value); + info.GetReturnValue().Set((v8::Local)value); } template @@ -255,7 +255,7 @@ void JSSpecialPropGet(const char* class_name, JS_Error(isolate, JSFormatErrorString(class_name, "GetProperty", sError)); return; } - info.GetReturnValue().Set((v8::Handle)value); + info.GetReturnValue().Set((v8::Local)value); } template @@ -445,6 +445,6 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToV8Value()) #define VALUE_NAME_NULL L"null" #define VALUE_NAME_UNDEFINED L"undefined" -FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle p); +FXJSVALUETYPE GET_VALUE_TYPE(v8::Local p); #endif //_JS_DEFINE_H_ diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index 02d2f57663..a9ad01835c 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h @@ -46,6 +46,7 @@ public: virtual ~CJS_Object(void); void MakeWeak(); + void Dispose(); virtual FX_BOOL IsType(FX_LPCSTR sClassName){return TRUE;}; virtual CFX_ByteString GetClassName(){return "";}; @@ -66,7 +67,7 @@ public: v8::Isolate* GetIsolate() {return m_pIsolate;} protected: CJS_EmbedObj * m_pEmbedObj; - v8::Persistent m_pObject; + v8::Global m_pObject; v8::Isolate* m_pIsolate; }; diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h index 07e4e43c84..0e824f994c 100644 --- a/fpdfsdk/include/javascript/JS_Runtime.h +++ b/fpdfsdk/include/javascript/JS_Runtime.h @@ -58,7 +58,7 @@ public: v8::Isolate* GetIsolate(){return m_isolate;}; void SetIsolate(v8::Isolate* isolate){m_isolate = isolate;} - v8::Handle NewJSContext(); + v8::Local NewJSContext(); virtual FX_BOOL GetHValueByName(FX_BSTR utf8Name, FXJSE_HVALUE hValue); @@ -73,7 +73,7 @@ protected: v8::Isolate* m_isolate; nonstd::unique_ptr m_pArrayBufferAllocator; - v8::Persistent m_context; + v8::Global m_context; }; #endif //_JS_RUNTIME_H_ diff --git a/fpdfsdk/include/javascript/JS_Value.h b/fpdfsdk/include/javascript/JS_Value.h index ecd0f832d4..faa612d21e 100644 --- a/fpdfsdk/include/javascript/JS_Value.h +++ b/fpdfsdk/include/javascript/JS_Value.h @@ -19,7 +19,7 @@ class CJS_Value { public: CJS_Value(v8::Isolate* isolate); - CJS_Value(v8::Isolate* isolate, v8::Handle pValue,FXJSVALUETYPE t); + CJS_Value(v8::Isolate* isolate, v8::Local pValue,FXJSVALUETYPE t); CJS_Value(v8::Isolate* isolate, const int &iValue); CJS_Value(v8::Isolate* isolate, const double &dValue); CJS_Value(v8::Isolate* isolate, const float &fValue); @@ -34,7 +34,7 @@ public: ~CJS_Value(); void SetNull(); - void Attach(v8::Handle pValue,FXJSVALUETYPE t); + void Attach(v8::Local pValue,FXJSVALUETYPE t); void Attach(CJS_Value *pValue); void Detach(); @@ -46,9 +46,9 @@ public: CJS_Object* ToCJSObject() const; CFX_WideString ToCFXWideString() const; CFX_ByteString ToCFXByteString() const; - v8::Handle ToV8Object() const; - v8::Handle ToV8Array() const; - v8::Handle ToV8Value() const; + v8::Local ToV8Object() const; + v8::Local ToV8Array() const; + v8::Local ToV8Value() const; void operator = (int iValue); void operator = (bool bValue); @@ -56,7 +56,7 @@ public: void operator = (float); void operator = (CJS_Object*); void operator = (CJS_Document*); - void operator = (v8::Handle); + void operator = (v8::Local); void operator = (CJS_Array &); void operator = (CJS_Date &); void operator = (FX_LPCWSTR pWstr); @@ -72,7 +72,7 @@ public: v8::Isolate* GetIsolate() {return m_isolate;} protected: - v8::Handle m_pValue; + v8::Local m_pValue; FXJSVALUETYPE m_eType; v8::Isolate* m_isolate; }; @@ -118,7 +118,7 @@ public: void operator<<(CJS_Array& array); void operator<<(CJS_Date& date); void operator>>(CJS_Date& date) const; - operator v8::Handle() const; + operator v8::Local() const; void StartSetting(); void StartGetting(); private: @@ -131,16 +131,16 @@ public: CJS_Array(v8::Isolate* isolate); virtual ~CJS_Array(); - void Attach(v8::Handle pArray); + void Attach(v8::Local pArray); void GetElement(unsigned index,CJS_Value &value); void SetElement(unsigned index,CJS_Value value); int GetLength(); FX_BOOL IsAttached(); - operator v8::Handle(); + operator v8::Local(); v8::Isolate* GetIsolate() {return m_isolate;} private: - v8::Handle m_pArray; + v8::Local m_pArray; v8::Isolate* m_isolate; }; @@ -152,7 +152,7 @@ public: CJS_Date(v8::Isolate* isolate,double dMsec_time); CJS_Date(v8::Isolate* isolate,int year, int mon, int day,int hour, int min, int sec); virtual ~CJS_Date(); - void Attach(v8::Handle pDate); + void Attach(v8::Local pDate); int GetYear(); void SetYear(int iYear); @@ -172,7 +172,7 @@ public: int GetSeconds(); void SetSeconds(int seconds); - operator v8::Handle(); + operator v8::Local(); operator double() const; CFX_WideString ToString() const; @@ -182,7 +182,7 @@ public: FX_BOOL IsValidDate(); protected: - v8::Handle m_pDate; + v8::Local m_pDate; v8::Isolate* m_isolate; }; diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h index 9ee9f42b42..2690f6822c 100644 --- a/fpdfsdk/include/javascript/global.h +++ b/fpdfsdk/include/javascript/global.h @@ -33,7 +33,7 @@ struct js_global_data double dData; bool bData; CFX_ByteString sData; - v8::Persistent pData; + v8::Global pData; bool bPersistent; bool bDeleted; }; @@ -61,8 +61,8 @@ private: FX_BOOL SetGlobalVariables(FX_LPCSTR propname, int nType, double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent); - void ObjectToArray(v8::Handle pObj, CJS_GlobalVariableArray& array); - void PutObjectProperty(v8::Handle obj, CJS_KeyValue* pData); + void ObjectToArray(v8::Local pObj, CJS_GlobalVariableArray& array); + void PutObjectProperty(v8::Local obj, CJS_KeyValue* pData); private: CFX_MapByteStringToPtr m_mapGlobal; diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index a32ace674b..cc1eb6b2c1 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -14,8 +14,8 @@ #include "../../../core/include/fxcrt/fx_string.h" // For CFX_WideString typedef v8::Value JSValue; -typedef v8::Handle JSObject; -typedef v8::Handle JSFXObject; +typedef v8::Local JSObject; +typedef v8::Local JSFXObject; enum FXJSOBJTYPE { @@ -49,77 +49,78 @@ typedef v8::Isolate IJS_Runtime; class IFXJS_Context; class IFXJS_Runtime; -typedef void (*LP_CONSTRUCTOR)(IFXJS_Context* cc, v8::Handle obj, v8::Handle global); -typedef void (*LP_DESTRUCTOR)(v8::Handle obj); +typedef void (*LP_CONSTRUCTOR)(IFXJS_Context* cc, v8::Local obj, v8::Local global); +typedef void (*LP_DESTRUCTOR)(v8::Local obj); int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew); int JS_DefineObjMethod(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall); int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, v8::AccessorGetterCallback pPropGet, v8::AccessorSetterCallback pPropPut); int JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::NamedPropertyQueryCallback pPropQurey, v8::NamedPropertyGetterCallback pPropGet, v8::NamedPropertySetterCallback pPropPut, v8::NamedPropertyDeleterCallback pPropDel); -int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sConstName, v8::Handle pDefault); +int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sConstName, v8::Local pDefault); int JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall); -int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Handle pDefault); +int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Local pDefault); -void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Persistent& v8PersistentContext); -void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Persistent& v8PersistentContext); +void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Global& v8PersistentContext); +void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Global& v8PersistentContext); void JS_Initial(); void JS_Release(); int JS_Parse(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror); int JS_Execute(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror); -v8::Handle JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, int nObjDefnID); -v8::Handle JS_GetStaticObj(IJS_Runtime* pJSRuntime, int nObjDefnID); +v8::Local JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, int nObjDefnID); +v8::Local JS_GetStaticObj(IJS_Runtime* pJSRuntime, int nObjDefnID); void JS_SetThisObj(IJS_Runtime* pJSRuntime, int nThisObjID); -v8::Handle JS_GetThisObj(IJS_Runtime * pJSRuntime); -int JS_GetObjDefnID(v8::Handle pObj); -IJS_Runtime* JS_GetRuntime(v8::Handle pObj); +v8::Local JS_GetThisObj(IJS_Runtime * pJSRuntime); +int JS_GetObjDefnID(v8::Local pObj); +IJS_Runtime* JS_GetRuntime(v8::Local pObj); int JS_GetObjDefnID(IJS_Runtime * pJSRuntime, const wchar_t* pObjName); void JS_Error(v8::Isolate* isolate, const CFX_WideString& message); unsigned JS_CalcHash(const wchar_t* main, unsigned nLen); unsigned JS_CalcHash(const wchar_t* main); -const wchar_t* JS_GetTypeof(v8::Handle pObj); -void JS_SetPrivate(IJS_Runtime* pJSRuntime, v8::Handle pObj, void* p); -void* JS_GetPrivate(IJS_Runtime* pJSRuntime, v8::Handle pObj); -void JS_SetPrivate(v8::Handle pObj, void* p); -void* JS_GetPrivate(v8::Handle pObj); -void JS_FreePrivate(v8::Handle pObj); -v8::Handle JS_GetObjectValue(v8::Handle pObj); -v8::Handle JS_GetObjectElement(IJS_Runtime* pJSRuntime, v8::Handle pObj,const wchar_t* PropertyName); -v8::Handle JS_GetObjectElementNames(v8::Handle pObj); -void JS_PutObjectString(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName, const wchar_t* sValue); -void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName, int nValue); -void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName, float fValue); -void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName, double dValue); -void JS_PutObjectBoolean(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName, bool bValue); -void JS_PutObjectObject(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName, v8::Handle pPut); -void JS_PutObjectNull(IJS_Runtime* pJSRuntime,v8::Handle pObj, const wchar_t* PropertyName); -unsigned JS_PutArrayElement(v8::Handle pArray,unsigned index,v8::Handle pValue,FXJSVALUETYPE eType); -v8::Handle JS_GetArrayElemnet(v8::Handle pArray,unsigned index); -unsigned JS_GetArrayLength(v8::Handle pArray); -v8::Handle JS_GetListValue(v8::Handle pList, int index); - - -v8::Handle JS_NewArray(IJS_Runtime* pJSRuntime); -v8::Handle JS_NewNumber(IJS_Runtime* pJSRuntime,int number); -v8::Handle JS_NewNumber(IJS_Runtime* pJSRuntime,double number); -v8::Handle JS_NewNumber(IJS_Runtime* pJSRuntime,float number); -v8::Handle JS_NewBoolean(IJS_Runtime* pJSRuntime,bool b); -v8::Handle JS_NewObject(IJS_Runtime* pJSRuntime,v8::Handle pObj); -v8::Handle JS_NewObject2(IJS_Runtime* pJSRuntime,v8::Handle pObj); -v8::Handle JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string); -v8::Handle JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string, unsigned nLen); -v8::Handle JS_NewNull(); -v8::Handle JS_NewDate(IJS_Runtime* pJSRuntime,double d); -v8::Handle JS_NewValue(IJS_Runtime* pJSRuntime); - - -int JS_ToInt32(v8::Handle pValue); -bool JS_ToBoolean(v8::Handle pValue); -double JS_ToNumber(v8::Handle pValue); -v8::Handle JS_ToObject(v8::Handle pValue); -CFX_WideString JS_ToString(v8::Handle pValue); -v8::Handle JS_ToArray(v8::Handle pValue); -void JS_ValueCopy(v8::Handle& pTo, v8::Handle pFrom); +const wchar_t* JS_GetTypeof(v8::Local pObj); +void JS_SetPrivate(IJS_Runtime* pJSRuntime, v8::Local pObj, void* p); +void* JS_GetPrivate(IJS_Runtime* pJSRuntime, v8::Local pObj); +void JS_SetPrivate(v8::Local pObj, void* p); +void* JS_GetPrivate(v8::Local pObj); +void JS_FreePrivate(void* p); +void JS_FreePrivate(v8::Local pObj); +v8::Local JS_GetObjectValue(v8::Local pObj); +v8::Local JS_GetObjectElement(IJS_Runtime* pJSRuntime, v8::Local pObj,const wchar_t* PropertyName); +v8::Local JS_GetObjectElementNames(IJS_Runtime* pJSRuntime, v8::Local pObj); +void JS_PutObjectString(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName, const wchar_t* sValue); +void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName, int nValue); +void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName, float fValue); +void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName, double dValue); +void JS_PutObjectBoolean(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName, bool bValue); +void JS_PutObjectObject(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName, v8::Local pPut); +void JS_PutObjectNull(IJS_Runtime* pJSRuntime,v8::Local pObj, const wchar_t* PropertyName); +unsigned JS_PutArrayElement(IJS_Runtime* pJSRuntime, v8::Local pArray,unsigned index,v8::Local pValue,FXJSVALUETYPE eType); +v8::Local JS_GetArrayElement(IJS_Runtime* pJSRuntime, v8::Local pArray,unsigned index); +unsigned JS_GetArrayLength(v8::Local pArray); +v8::Local JS_GetListValue(IJS_Runtime* pJSRuntime, v8::Local pList, int index); + + +v8::Local JS_NewArray(IJS_Runtime* pJSRuntime); +v8::Local JS_NewNumber(IJS_Runtime* pJSRuntime,int number); +v8::Local JS_NewNumber(IJS_Runtime* pJSRuntime,double number); +v8::Local JS_NewNumber(IJS_Runtime* pJSRuntime,float number); +v8::Local JS_NewBoolean(IJS_Runtime* pJSRuntime,bool b); +v8::Local JS_NewObject(IJS_Runtime* pJSRuntime,v8::Local pObj); +v8::Local JS_NewObject2(IJS_Runtime* pJSRuntime,v8::Local pObj); +v8::Local JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string); +v8::Local JS_NewString(IJS_Runtime* pJSRuntime,const wchar_t* string, unsigned nLen); +v8::Local JS_NewNull(); +v8::Local JS_NewDate(IJS_Runtime* pJSRuntime,double d); +v8::Local JS_NewValue(IJS_Runtime* pJSRuntime); + + +int JS_ToInt32(IJS_Runtime* pJSRuntime, v8::Local pValue); +bool JS_ToBoolean(IJS_Runtime* pJSRuntime, v8::Local pValue); +double JS_ToNumber(IJS_Runtime* pJSRuntime, v8::Local pValue); +v8::Local JS_ToObject(IJS_Runtime* pJSRuntime, v8::Local pValue); +CFX_WideString JS_ToString(IJS_Runtime* pJSRuntime, v8::Local pValue); +v8::Local JS_ToArray(IJS_Runtime* pJSRuntime, v8::Local pValue); +void JS_ValueCopy(v8::Local& pTo, v8::Local pFrom); double JS_GetDateTime(); int JS_GetYearFromTime(double dt); -- cgit v1.2.3