Merge to XFA: Plumb in an externally created v8::Isolate

fpdfsdk/src/javascript/JS_Runtime.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/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Runtime.h"
@@ skipping 19 matching lines @@
 #include "../../../xfa/src/fxjse/src/value.h"
 
 CJS_RuntimeFactory::~CJS_RuntimeFactory()
 {
 }
 
 IFXJS_Runtime*                  CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp)
 {
         if (!m_bInit)
         {
-                JS_Initial();
+                unsigned int embedderDataSlot = 0;
+                if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
+                        embedderDataSlot = pApp->GetFormFillInfo()->m_pJsPlatform->m_v8EmbedderSlot;
+                }
+                JS_Initial(embedderDataSlot);
                 m_bInit = TRUE;
         }
         return new CJS_Runtime(pApp);
 }
 void                            CJS_RuntimeFactory::AddRef()
 {
     //to do.Should be implemented as atom manipulation.
     m_nRef++;
 }
 void                            CJS_RuntimeFactory::Release()
@@ skipping 49 matching lines @@
 void CJS_ArrayBufferAllocator::Free(void* data, size_t length) {
     free(data);
 }
 
 /* ------------------------------ CJS_Runtime ------------------------------ */
 extern v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* pJSRuntime);
 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) :
         m_pApp(pApp),
         m_pDocument(NULL),
         m_bBlocking(FALSE),
-        m_pFieldEventPath(NULL)
+        m_pFieldEventPath(NULL),
+        m_isolate(NULL)
 {
         if (CPDFXFA_App::GetInstance()->GetJSERuntime()) {
+                // TODO(tsepez): CPDFXFA_App should also use the embedder provided isolate.
                 m_isolate = (v8::Isolate*)CPDFXFA_App::GetInstance()->GetJSERuntime();
-        } else {
+        } else if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
+                m_isolate = reinterpret_cast<v8::Isolate*>(m_pApp->GetFormFillInfo()->m_pJsPlatform->m_isolate);
+        }
+        if (!m_isolate) {
                 m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator());
+
                 v8::Isolate::CreateParams params;
                 params.array_buffer_allocator = m_pArrayBufferAllocator.get();
                 m_isolate = v8::Isolate::New(params);
-        }
+        }
 
         v8::Isolate* isolate = m_isolate;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::Locker locker(isolate);
         v8::HandleScope handle_scope(isolate);
         if (CPDFXFA_App::GetInstance()->InitRuntime(FALSE)) {
                 CJS_Context * pContext = (CJS_Context*)NewContext();
                 JS_InitialRuntime(*this, this, pContext, m_context);
                 ReleaseContext(pContext);
                 return;
@@ skipping 255 matching lines @@
     v8::Local<v8::Context> context =
         v8::Local<v8::Context>::New(pIsolate, m_context);
     v8::Context::Scope context_scope(context);
 
         //v8::Local<v8::Context> tmpCotext = v8::Local<v8::Context>::New(GetIsolate(), m_context);
         v8::Local<v8::Value> propvalue = v8::Local<v8::Value>::New(GetIsolate(),((CFXJSE_Value*)hValue)->DirectGetValue());
         context->Global()->Set(v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString, utf8Name.GetLength()), propvalue);
 
         return TRUE;
 }