fpdfsdk/include/javascript/JS_Define.h - Issue 1138823004: Replace v8::Handle with v8::Local and v8::Persistent with v8::Global

Unified Diff: fpdfsdk/include/javascript/JS_Define.h

Issue 1138823004: Replace v8::Handle with v8::Local and v8::Persistent with v8::Global (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: fpdfsdk/include/javascript/JS_Define.h

diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h

index 1c3c64e4ddcc9b1a1c6cc1f8c550a959cca6e872..4fcd50600c1350e0ed7aceace58e2453e8ba9e4a 100644

--- a/fpdfsdk/include/javascript/JS_Define.h

+++ b/fpdfsdk/include/javascript/JS_Define.h

@@ -60,7 +60,7 @@ void JSPropGetter(const char* prop_name_string,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* pContext = pRuntime->GetCurrentContext();

CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());

@@ -72,7 +72,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<v8::Value>)value);

+ info.GetReturnValue().Set((v8::Local<v8::Value>)value);

}

template <class C, FX_BOOL (C::*M)(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)>

@@ -84,7 +84,7 @@ void JSPropSetter(const char* prop_name_string,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* pContext = pRuntime->GetCurrentContext();

CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());

@@ -121,7 +121,7 @@ void JSMethod(const char* method_name_string,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* cc = pRuntime->GetCurrentContext();

CJS_Parameters parameters;

@@ -252,7 +252,7 @@ void JSSpecialPropGet(const char* class_name,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();

CJS_Object* pJSObj = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));

@@ -266,7 +266,7 @@ void JSSpecialPropGet(const char* class_name,

JS_Error(isolate, JSFormatErrorString(class_name, "GetProperty", sError));

return;

}

- info.GetReturnValue().Set((v8::Handle<v8::Value>)value);

+ info.GetReturnValue().Set((v8::Local<v8::Value>)value);

}

template <class Alt>

@@ -277,7 +277,7 @@ void JSSpecialPropPut(const char* class_name,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();

CJS_Object* pJSObj = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));

@@ -299,7 +299,7 @@ void JSSpecialPropDel(const char* class_name,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();

CJS_Object* pJSObj = reinterpret_cast<CJS_Object*>(JS_GetPrivate(isolate, info.Holder()));

@@ -389,7 +389,7 @@ void JSGlobalFunc(const char *func_name_string,

v8::Isolate* isolate = info.GetIsolate();

v8::Local<v8::Context> context = isolate->GetCurrentContext();

v8::Local<v8::Value> v = context->GetEmbedderData(1);

- v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(v);

+ v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);

IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();

IFXJS_Context* cc = pRuntime->GetCurrentContext();

CJS_Parameters parameters;

@@ -464,6 +464,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<v8::Value> p);

+FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p);

#endif //_JS_DEFINE_H_

« no previous file with comments | « no previous file | fpdfsdk/include/javascript/JS_Object.h » ('j') | no next file with comments »