From b8ec0a3405c6f184e4b9811870081295cae078c9 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 20 Nov 2015 14:23:02 -0800 Subject: Mising JS refactoring in XFA. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1463973002 . --- fpdfsdk/include/jsapi/fxjs_v8.h | 4 ++-- fpdfsdk/src/javascript/JS_Define.h | 27 +++++++++++++-------------- fpdfsdk/src/jsapi/fxjs_v8.cpp | 13 +++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index 3b5e6af180..8263cd4eeb 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -136,13 +136,13 @@ void FXJS_ReleaseRuntime(v8::Isolate* pIsolate, v8::Global* pV8PersistentContext, std::vector*>* pStaticObjects); +IJS_Runtime* FXJS_GetRuntimeFromIsolate(v8::Isolate* pIsolate); + // Called as part of FXJS_InitializeRuntime, exposed so PDF can make its // own contexts compatible with XFA or vice versa. void FXJS_SetRuntimeForV8Context(v8::Local v8Context, IJS_Runtime* pIRuntime); -IJS_Runtime* FXJS_GetRuntimeFromV8Context(v8::Local v8Context); - // Called after FXJS_InitializeRuntime call made. int FXJS_Execute(v8::Isolate* pIsolate, IJS_Context* pJSContext, diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h index 740295e1cb..02b36f9322 100644 --- a/fpdfsdk/src/javascript/JS_Define.h +++ b/fpdfsdk/src/javascript/JS_Define.h @@ -78,8 +78,8 @@ void JSPropGetter(const char* prop_name_string, v8::Local property, const v8::PropertyCallbackInfo& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = static_cast( - FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); + CJS_Runtime* pRuntime = + static_cast(FXJS_GetRuntimeFromIsolate(isolate)); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -104,8 +104,8 @@ void JSPropSetter(const char* prop_name_string, v8::Local value, const v8::PropertyCallbackInfo& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = static_cast( - FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); + CJS_Runtime* pRuntime = + static_cast(FXJS_GetRuntimeFromIsolate(isolate)); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -143,8 +143,8 @@ void JSMethod(const char* method_name_string, const char* class_name_string, const v8::FunctionCallbackInfo& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = static_cast( - FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); + CJS_Runtime* pRuntime = + static_cast(FXJS_GetRuntimeFromIsolate(isolate)); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -366,8 +366,8 @@ void JSSpecialPropGet(const char* class_name, v8::Local property, const v8::PropertyCallbackInfo& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = static_cast( - FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); + CJS_Runtime* pRuntime = + static_cast(FXJS_GetRuntimeFromIsolate(isolate)); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -393,8 +393,8 @@ void JSSpecialPropPut(const char* class_name, v8::Local value, const v8::PropertyCallbackInfo& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = static_cast( - FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); + CJS_Runtime* pRuntime = + static_cast(FXJS_GetRuntimeFromIsolate(isolate)); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -417,8 +417,7 @@ void JSSpecialPropDel(const char* class_name, v8::Local property, const v8::PropertyCallbackInfo& info) { v8::Isolate* isolate = info.GetIsolate(); - IJS_Runtime* pRuntime = - FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext()); + IJS_Runtime* pRuntime = FXJS_GetRuntimeFromIsolate(isolate); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -442,8 +441,8 @@ template void JSGlobalFunc(const char* func_name_string, const v8::FunctionCallbackInfo& info) { - CJS_Runtime* pRuntime = static_cast( - FXJS_GetRuntimeFromV8Context(info.GetIsolate()->GetCurrentContext())); + CJS_Runtime* pRuntime = + static_cast(FXJS_GetRuntimeFromIsolate(info.GetIsolate())); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index a3100bec41..9c2c538aa8 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -288,7 +288,7 @@ void FXJS_InitializeRuntime( v8::Context::Scope context_scope(v8Context); FXJS_PerIsolateData::SetUp(pIsolate); - FXJS_SetRuntimeForV8Context(v8Context, pIRuntime); + v8Context->SetAlignedPointerInEmbedderData(kPerContextDataIndex, pIRuntime); int maxID = CFXJS_ObjDefinition::MaxID(pIsolate); pStaticObjects->resize(maxID + 1); @@ -366,16 +366,17 @@ void FXJS_ReleaseRuntime(v8::Isolate* pIsolate, delete pData; } +IJS_Runtime* FXJS_GetRuntimeFromIsolate(v8::Isolate* pIsolate) { + v8::Local context = pIsolate->GetCurrentContext(); + return static_cast( + context->GetAlignedPointerFromEmbedderData(kPerContextDataIndex)); +} + void FXJS_SetRuntimeForV8Context(v8::Local v8Context, IJS_Runtime* pIRuntime) { v8Context->SetAlignedPointerInEmbedderData(kPerContextDataIndex, pIRuntime); } -IJS_Runtime* FXJS_GetRuntimeFromV8Context(v8::Local v8Context) { - return static_cast( - v8Context->GetAlignedPointerFromEmbedderData(kPerContextDataIndex)); -} - int FXJS_Execute(v8::Isolate* pIsolate, IJS_Context* pJSContext, const wchar_t* script, -- cgit v1.2.3