diff options
Diffstat (limited to 'fpdfsdk/src/javascript')
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Define.h | 27 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Runtime.cpp | 12 |
2 files changed, 24 insertions, 15 deletions
diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h index 3ebd07518e..b097aaa63f 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<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = - static_cast<CJS_Runtime*>(FXJS_GetRuntimeFromIsolate(isolate)); + CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>( + FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -104,8 +104,8 @@ void JSPropSetter(const char* prop_name_string, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = - static_cast<CJS_Runtime*>(FXJS_GetRuntimeFromIsolate(isolate)); + CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>( + FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); 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<v8::Value>& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = - static_cast<CJS_Runtime*>(FXJS_GetRuntimeFromIsolate(isolate)); + CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>( + FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -366,8 +366,8 @@ void JSSpecialPropGet(const char* class_name, v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = - static_cast<CJS_Runtime*>(FXJS_GetRuntimeFromIsolate(isolate)); + CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>( + FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -393,8 +393,8 @@ void JSSpecialPropPut(const char* class_name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info) { v8::Isolate* isolate = info.GetIsolate(); - CJS_Runtime* pRuntime = - static_cast<CJS_Runtime*>(FXJS_GetRuntimeFromIsolate(isolate)); + CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>( + FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext())); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -417,7 +417,8 @@ void JSSpecialPropDel(const char* class_name, v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Boolean>& info) { v8::Isolate* isolate = info.GetIsolate(); - IJS_Runtime* pRuntime = FXJS_GetRuntimeFromIsolate(isolate); + IJS_Runtime* pRuntime = + FXJS_GetRuntimeFromV8Context(isolate->GetCurrentContext()); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -439,8 +440,8 @@ template <FX_BOOL ( *F)(IJS_Context*, const CJS_Parameters&, CJS_Value&, CFX_WideString&)> void JSGlobalFunc(const char* func_name_string, const v8::FunctionCallbackInfo<v8::Value>& info) { - CJS_Runtime* pRuntime = - static_cast<CJS_Runtime*>(FXJS_GetRuntimeFromIsolate(info.GetIsolate())); + CJS_Runtime* pRuntime = static_cast<CJS_Runtime*>( + FXJS_GetRuntimeFromV8Context(info.GetIsolate()->GetCurrentContext())); if (!pRuntime) return; IJS_Context* pContext = pRuntime->GetCurrentContext(); diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 8b0475b851..ecb53d2d72 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -245,12 +245,20 @@ FX_BOOL CJS_Runtime::GetHValueByName(const CFX_ByteStringC& utf8Name, v8::Locker lock(GetIsolate()); v8::Isolate::Scope isolate_scope(GetIsolate()); v8::HandleScope handle_scope(GetIsolate()); + v8::Local<v8::Context> old_context = GetIsolate()->GetCurrentContext(); v8::Local<v8::Context> context = v8::Local<v8::Context>::New(GetIsolate(), m_context); v8::Context::Scope context_scope(context); - // v8::Local<v8::Context> tmpCotext = - // v8::Local<v8::Context>::New(GetIsolate(), m_context); + // Caution: We're about to hand to XFA an object that in order to invoke + // methods will require that the current v8::Context always has a pointer + // to a CJS_Runtime in its embedder data slot. Unfortunately, XFA creates + // its own v8::Context which has not initialized the embedder data slot. + // Do so now. + // TODO(tsepez): redesign PDF-side objects to not rely on v8::Context's + // embedder data slots, and/or to always use the right context. + FXJS_SetRuntimeForV8Context(old_context, this); + v8::Local<v8::Value> propvalue = context->Global()->Get(v8::String::NewFromUtf8( GetIsolate(), name, v8::String::kNormalString, utf8Name.GetLength())); |