XFA: Pass IFXJS_Runtime via V8 contexts, not V8 isolates

fpdfsdk/include/javascript/JS_Define.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
 
 #include "../jsapi/fxjs_v8.h"
@@ skipping 61 matching lines @@
 /* ======================================== PROP CALLBACK
  * ============================================ */
 
 template <class C,
           FX_BOOL (C::*M)(IFXJS_Context*, CJS_PropValue&, CFX_WideString&)>
 void JSPropGetter(const char* prop_name_string,
                   const char* class_name_string,
                   v8::Local<v8::String> property,
                   const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
-  CJS_PropValue value(isolate);
-  value.StartGetting();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  if (v.IsEmpty())
+    return;
+  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 = (CJS_Object*)FXJS_GetPrivate(isolate, info.Holder());
   C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
   CFX_WideString sError;
+  CJS_PropValue value(isolate);
+  value.StartGetting();
   if (!(pObj->*M)(pRuntimeContext, value, sError)) {
     FXJS_Error(isolate, JSFormatErrorString(class_name_string, prop_name_string,
                                             sError));
     return;
   }
   info.GetReturnValue().Set((v8::Local<v8::Value>)value);
 }
 
 template <class C,
           FX_BOOL (C::*M)(IFXJS_Context*, CJS_PropValue&, CFX_WideString&)>
 void JSPropSetter(const char* prop_name_string,
                   const char* class_name_string,
                   v8::Local<v8::String> property,
                   v8::Local<v8::Value> value,
                   const v8::PropertyCallbackInfo<void>& info) {
   v8::Isolate* isolate = info.GetIsolate();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
-  CJS_PropValue propValue(CJS_Value(isolate, value, CJS_Value::VT_unknown));
-  propValue.StartSetting();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  if (v.IsEmpty())
+    return;
+  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 = (CJS_Object*)FXJS_GetPrivate(isolate, info.Holder());
   C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
   CFX_WideString sError;
+  CJS_PropValue propValue(CJS_Value(isolate, value, CJS_Value::VT_unknown));
+  propValue.StartSetting();
   if (!(pObj->*M)(pRuntimeContext, propValue, sError)) {
     FXJS_Error(isolate, JSFormatErrorString(class_name_string, prop_name_string,
                                             sError));
   }
 }
 
 #define JS_STATIC_PROP(prop_name, class_name)                                 \
   static void get_##prop_name##_static(                                       \
       v8::Local<v8::String> property,                                         \
       const v8::PropertyCallbackInfo<v8::Value>& info) {                      \
@@ skipping 12 matching lines @@
 
 template <class C,
           FX_BOOL (C::*M)(IFXJS_Context*,
                           const CJS_Parameters&,
                           CJS_Value&,
                           CFX_WideString&)>
 void JSMethod(const char* method_name_string,
               const char* class_name_string,
               const v8::FunctionCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  if (v.IsEmpty())
+    return;
+  v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
   CJS_Parameters parameters;
   for (unsigned int i = 0; i < (unsigned int)info.Length(); i++) {
     parameters.push_back(CJS_Value(isolate, info[i], CJS_Value::VT_unknown));
   }
   CJS_Value valueRes(isolate);
   CJS_Object* pJSObj = (CJS_Object*)FXJS_GetPrivate(isolate, info.Holder());
   C* pObj = reinterpret_cast<C*>(pJSObj->GetEmbedObject());
   CFX_WideString sError;
   if (!(pObj->*M)(pRuntimeContext, parameters, valueRes, sError)) {
     FXJS_Error(isolate, JSFormatErrorString(class_name_string,
@@ skipping 105 matching lines @@
   FX_BOOL bRet = pObj->QueryProperty(propname.c_str());
   info.GetReturnValue().Set(bRet ? 4 : 0);
 }
 
 template <class Alt>
 void JSSpecialPropGet(const char* class_name,
                       v8::Local<v8::String> property,
                       const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  if (v.IsEmpty())
+    return;
+  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*>(FXJS_GetPrivate(isolate, info.Holder()));
   Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
   v8::String::Utf8Value utf8_value(property);
   CFX_WideString propname =
       CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
   CFX_WideString sError;
   CJS_PropValue value(isolate);
   value.StartGetting();
   if (!pObj->DoProperty(pRuntimeContext, propname.c_str(), value, sError)) {
     FXJS_Error(isolate, JSFormatErrorString(class_name, "GetProperty", sError));
     return;
   }
   info.GetReturnValue().Set((v8::Local<v8::Value>)value);
 }
 
 template <class Alt>
 void JSSpecialPropPut(const char* class_name,
                       v8::Local<v8::String> property,
                       v8::Local<v8::Value> value,
                       const v8::PropertyCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  if (v.IsEmpty())
+    return;
+  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*>(FXJS_GetPrivate(isolate, info.Holder()));
   Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
   v8::String::Utf8Value utf8_value(property);
   CFX_WideString propname =
       CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
   CFX_WideString sError;
   CJS_PropValue PropValue(CJS_Value(isolate, value, CJS_Value::VT_unknown));
   PropValue.StartSetting();
   if (!pObj->DoProperty(pRuntimeContext, propname.c_str(), PropValue, sError)) {
     FXJS_Error(isolate, JSFormatErrorString(class_name, "PutProperty", sError));
   }
 }
 
 template <class Alt>
 void JSSpecialPropDel(const char* class_name,
                       v8::Local<v8::String> property,
                       const v8::PropertyCallbackInfo<v8::Boolean>& info) {
   v8::Isolate* isolate = info.GetIsolate();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);
+  if (v.IsEmpty())
+    return;
+  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*>(FXJS_GetPrivate(isolate, info.Holder()));
   Alt* pObj = reinterpret_cast<Alt*>(pJSObj->GetEmbedObject());
   v8::String::Utf8Value utf8_value(property);
   CFX_WideString propname =
       CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());
   CFX_WideString sError;
   if (!pObj->DelProperty(pRuntimeContext, propname.c_str(), sError)) {
     CFX_ByteString cbName;
     cbName.Format("%s.%s", class_name, "DelProperty");
@@ skipping 84 matching lines @@
   }
 
 /* ======================================== GLOBAL METHODS
  * ============================================ */
 
 template <FX_BOOL (
     *F)(IFXJS_Context*, const CJS_Parameters&, CJS_Value&, CFX_WideString&)>
 void JSGlobalFunc(const char* func_name_string,
                   const v8::FunctionCallbackInfo<v8::Value>& info) {
   v8::Isolate* isolate = info.GetIsolate();
-  FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(isolate);
-  IFXJS_Context* pRuntimeContext = pData->m_pFXJSRuntime->GetCurrentContext();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+  v8::Local<v8::Value> v = context->GetEmbedderData(1);

[jochen (gone - plz use gerrit), 2015/09/25 11:17:10]

if you use GetAlignedPointerFromInternalField /
SetAlignedPointerFromInternalField, you can store pointers directly in those
slots. However, juggling around with v8::External is also fine.

[Tom Sepez, 2015/09/25 16:40:11]

I'll do this in a follow-up patch on master, then merge back here to XFA.

+  if (v.IsEmpty())
+    return;
+  v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
+  IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
+  IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
   CJS_Parameters parameters;
   for (unsigned int i = 0; i < (unsigned int)info.Length(); i++) {
     parameters.push_back(CJS_Value(isolate, info[i], CJS_Value::VT_unknown));
   }
   CJS_Value valueRes(isolate);
   CFX_WideString sError;
   if (!(*F)(pRuntimeContext, parameters, valueRes, sError)) {
     FXJS_Error(isolate, JSFormatErrorString(func_name_string, nullptr, sError));
     return;
   }
@@ skipping 22 matching lines @@
     for (int i = 0; i < FX_ArraySize(global_methods) - 1; ++i) {             \
       FXJS_DefineGlobalMethod(pIsolate,                                      \
                               js_class_name::global_methods[i].pName,        \
                               js_class_name::global_methods[i].pMethodCall); \
     }                                                                        \
   }
 
 CJS_Value::Type GET_VALUE_TYPE(v8::Local<v8::Value> p);
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_