Merge to XFA: Keep "static" objects per-context rather than per isolate.

fpdfsdk/src/jsapi/fxjs_v8.cpp

 // 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
 
 #include "../../include/jsapi/fxjs_v8.h"
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ skipping 77 matching lines @@
   }
 
   const wchar_t* const m_ObjName;
   const FXJSOBJTYPE m_ObjType;
   const FXJS_CONSTRUCTOR m_pConstructor;
   const FXJS_DESTRUCTOR m_pDestructor;
 
   v8::Isolate* m_pIsolate;
   v8::Global<v8::FunctionTemplate> m_FunctionTemplate;
   v8::Global<v8::Signature> m_Signature;
-  v8::Global<v8::Object> m_StaticObj;
 };
 
 static v8::Local<v8::ObjectTemplate> GetGlobalObjectTemplate(
     v8::Isolate* pIsolate) {
   int maxID = CFXJS_ObjDefinition::MaxID(pIsolate);
   for (int i = 0; i < maxID; ++i) {
     CFXJS_ObjDefinition* pObjDef = CFXJS_ObjDefinition::ForID(pIsolate, i);
     if (pObjDef->m_ObjType == FXJSOBJTYPE_GLOBAL)
       return pObjDef->GetInstanceTemplate();
   }
@@ skipping 157 matching lines @@
                             v8::Local<v8::Value> pDefault) {
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   CFX_ByteString bsConst = CFX_WideString(sConstName).UTF8Encode();
   GetGlobalObjectTemplate(pIsolate)->Set(
       v8::String::NewFromUtf8(pIsolate, bsConst.c_str(),
                               v8::NewStringType::kNormal).ToLocalChecked(),
       pDefault, v8::ReadOnly);
 }
 
-void FXJS_InitializeRuntime(v8::Isolate* pIsolate,
-                            IJS_Runtime* pIRuntime,
-                            v8::Global<v8::Context>& v8PersistentContext) {
+void FXJS_InitializeRuntime(
+    v8::Isolate* pIsolate,
+    IJS_Runtime* pIRuntime,
+    v8::Global<v8::Context>* pV8PersistentContext,
+    std::vector<v8::Global<v8::Object>*>* pStaticObjects) {
   if (pIsolate == g_isolate)
     ++g_isolate_ref_count;
 
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::Locker locker(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   v8::Local<v8::Context> v8Context =
       v8::Context::New(pIsolate, NULL, GetGlobalObjectTemplate(pIsolate));
   v8::Context::Scope context_scope(v8Context);
 
   FXJS_PerIsolateData::SetUp(pIsolate);
   FXJS_SetRuntimeForV8Context(v8Context, pIRuntime);
 
   int maxID = CFXJS_ObjDefinition::MaxID(pIsolate);
+  pStaticObjects->resize(maxID + 1);
   for (int i = 0; i < maxID; ++i) {
     CFXJS_ObjDefinition* pObjDef = CFXJS_ObjDefinition::ForID(pIsolate, i);
-    CFX_ByteString bs = CFX_WideString(pObjDef->m_ObjName).UTF8Encode();
-    v8::Local<v8::String> m_ObjName =
-        v8::String::NewFromUtf8(pIsolate, bs.c_str(),
-                                v8::NewStringType::kNormal,
-                                bs.GetLength()).ToLocalChecked();
-
     if (pObjDef->m_ObjType == FXJSOBJTYPE_GLOBAL) {
       v8Context->Global()
           ->GetPrototype()
           ->ToObject(v8Context)
           .ToLocalChecked()
           ->SetAlignedPointerInInternalField(0, new CFXJS_PerObjectData(i));
 
       if (pObjDef->m_pConstructor)
         pObjDef->m_pConstructor(pIRuntime, v8Context->Global()
                                                ->GetPrototype()
                                                ->ToObject(v8Context)
                                                .ToLocalChecked());
     } else if (pObjDef->m_ObjType == FXJSOBJTYPE_STATIC) {
+      CFX_ByteString bs = CFX_WideString(pObjDef->m_ObjName).UTF8Encode();
+      v8::Local<v8::String> m_ObjName =
+          v8::String::NewFromUtf8(pIsolate, bs.c_str(),
+                                  v8::NewStringType::kNormal,
+                                  bs.GetLength()).ToLocalChecked();
+
       v8::Local<v8::Object> obj = FXJS_NewFxDynamicObj(pIsolate, pIRuntime, i);
       v8Context->Global()->Set(v8Context, m_ObjName, obj).FromJust();
-      pObjDef->m_StaticObj.Reset(pIsolate, obj);
+      pStaticObjects->at(i) = new v8::Global<v8::Object>(pIsolate, obj);
     }
   }
-  v8PersistentContext.Reset(pIsolate, v8Context);
+  pV8PersistentContext->Reset(pIsolate, v8Context);
 }
 
 void FXJS_ReleaseRuntime(v8::Isolate* pIsolate,
-                         v8::Global<v8::Context>& v8PersistentContext) {
-  if (pIsolate == g_isolate && --g_isolate_ref_count > 0)
-    return;
-
+                         v8::Global<v8::Context>* pV8PersistentContext,
+                         std::vector<v8::Global<v8::Object>*>* pStaticObjects) {
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::Locker locker(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   v8::Local<v8::Context> context =
-      v8::Local<v8::Context>::New(pIsolate, v8PersistentContext);
+      v8::Local<v8::Context>::New(pIsolate, *pV8PersistentContext);
   v8::Context::Scope context_scope(context);
 
   FXJS_PerIsolateData* pData = FXJS_PerIsolateData::Get(pIsolate);
   if (!pData)
     return;
 
   // XFA, if present, should have already cleaned itself up.
   FXSYS_assert(!pData->m_pFXJSERuntimeData);
 
   int maxID = CFXJS_ObjDefinition::MaxID(pIsolate);
   for (int i = 0; i < maxID; ++i) {
     CFXJS_ObjDefinition* pObjDef = CFXJS_ObjDefinition::ForID(pIsolate, i);
     v8::Local<v8::Object> pObj;
     if (pObjDef->m_ObjType == FXJSOBJTYPE_GLOBAL) {
       pObj =
           context->Global()->GetPrototype()->ToObject(context).ToLocalChecked();
-    } else if (!pObjDef->m_StaticObj.IsEmpty()) {
-      pObj = v8::Local<v8::Object>::New(pIsolate, pObjDef->m_StaticObj);
+    } else if (pStaticObjects->at(i) && !pStaticObjects->at(i)->IsEmpty()) {
+      pObj = v8::Local<v8::Object>::New(pIsolate, *pStaticObjects->at(i));
+      delete pStaticObjects->at(i);
+      pStaticObjects->at(i) = nullptr;
     }
 
     if (!pObj.IsEmpty()) {
       if (pObjDef->m_pDestructor)
         pObjDef->m_pDestructor(pObj);
       FXJS_FreePrivate(pObj);
     }
     delete pObjDef;
   }
 
+  if (pIsolate == g_isolate && --g_isolate_ref_count > 0)
+    return;
+
   pIsolate->SetData(g_embedderDataSlot, nullptr);
   delete pData;
 }
 
 void FXJS_SetRuntimeForV8Context(v8::Local<v8::Context> v8Context,
                                  IJS_Runtime* pIRuntime) {
   v8Context->SetAlignedPointerInEmbedderData(kPerContextDataIndex, pIRuntime);
 }
 
 IJS_Runtime* FXJS_GetRuntimeFromV8Context(v8::Local<v8::Context> v8Context) {
@@ skipping 383 matching lines @@
     return v8::Local<v8::Array>();
   v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
   return v8::Local<v8::Array>::Cast(pValue->ToObject(context).ToLocalChecked());
 }
 
 void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom) {
   pTo = pFrom;
 }