Merge to XFA: Remove some abstractions in fxjs_v8.h.

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 76 matching lines @@
 
 void* CJS_ArrayBufferAllocator::AllocateUninitialized(size_t length) {
   return malloc(length);
 }
 
 void CJS_ArrayBufferAllocator::Free(void* data, size_t length) {
   free(data);
 }
 
 /* ------------------------------ CJS_Runtime ------------------------------ */
-extern v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(
-    IJS_Runtime* pJSRuntime);
+v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(v8::Isolate* pIsolate);
+
 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
     : m_pApp(pApp),
       m_pDocument(NULL),
       m_bBlocking(FALSE),
       m_pFieldEventPath(NULL),
       m_isolate(NULL),
       m_isolateManaged(false) {
   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 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);
     m_isolateManaged = true;
   }
 
   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);
+    JS_InitialRuntime(GetIsolate(), this, pContext, m_context);
     ReleaseContext(pContext);
     return;
   }
 
   InitJSObjects();
 
   CJS_Context* pContext = (CJS_Context*)NewContext();
-  JS_InitialRuntime(*this, this, pContext, m_context);
+  JS_InitialRuntime(GetIsolate(), this, pContext, m_context);
   ReleaseContext(pContext);
 }
 
 CJS_Runtime::~CJS_Runtime() {
   int size = m_ContextArray.GetSize();
   for (int i = 0; i < size; i++)
     delete m_ContextArray.GetAt(i);
 
   m_ContextArray.RemoveAll();
 
   RemoveEventsInLoop(m_pFieldEventPath);
 
   m_pApp = NULL;
   m_pDocument = NULL;
   m_pFieldEventPath = NULL;
   m_context.Reset();
 
   if (m_isolateManaged)
     m_isolate->Dispose();
   m_isolate = NULL;
 }
 
 FX_BOOL CJS_Runtime::InitJSObjects() {
   v8::Isolate::Scope isolate_scope(GetIsolate());
   v8::Locker locker(GetIsolate());
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
   v8::Context::Scope context_scope(context);
   // 0 - 8
-  if (CJS_Border::Init(*this, JS_STATIC) < 0)
+  if (CJS_Border::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Display::Init(*this, JS_STATIC) < 0)
+  if (CJS_Display::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Font::Init(*this, JS_STATIC) < 0)
+  if (CJS_Font::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Highlight::Init(*this, JS_STATIC) < 0)
+  if (CJS_Highlight::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Position::Init(*this, JS_STATIC) < 0)
+  if (CJS_Position::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0)
+  if (CJS_ScaleHow::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0)
+  if (CJS_ScaleWhen::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Style::Init(*this, JS_STATIC) < 0)
+  if (CJS_Style::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0)
+  if (CJS_Zoomtype::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
 
   // 9 - 11
-  if (CJS_App::Init(*this, JS_STATIC) < 0)
+  if (CJS_App::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Color::Init(*this, JS_STATIC) < 0)
+  if (CJS_Color::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Console::Init(*this, JS_STATIC) < 0)
+  if (CJS_Console::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
 
   // 12 - 14
-  if (CJS_Document::Init(*this, JS_DYNAMIC) < 0)
+  if (CJS_Document::Init(GetIsolate(), JS_DYNAMIC) < 0)
     return FALSE;
-  if (CJS_Event::Init(*this, JS_STATIC) < 0)
+  if (CJS_Event::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Field::Init(*this, JS_DYNAMIC) < 0)
+  if (CJS_Field::Init(GetIsolate(), JS_DYNAMIC) < 0)
     return FALSE;
 
   // 15 - 17
-  if (CJS_Global::Init(*this, JS_STATIC) < 0)
+  if (CJS_Global::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
-  if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0)
+  if (CJS_Icon::Init(GetIsolate(), JS_DYNAMIC) < 0)
     return FALSE;
-  if (CJS_Util::Init(*this, JS_STATIC) < 0)
+  if (CJS_Util::Init(GetIsolate(), JS_STATIC) < 0)
     return FALSE;
 
-  if (CJS_PublicMethods::Init(*this) < 0)
+  if (CJS_PublicMethods::Init(GetIsolate()) < 0)
     return FALSE;
-  if (CJS_GlobalConsts::Init(*this) < 0)
+  if (CJS_GlobalConsts::Init(GetIsolate()) < 0)
     return FALSE;
-  if (CJS_GlobalArrays::Init(*this) < 0)
+  if (CJS_GlobalArrays::Init(GetIsolate()) < 0)
     return FALSE;
 
-  if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0)
+  if (CJS_TimerObj::Init(GetIsolate(), JS_DYNAMIC) < 0)
     return FALSE;
-  if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) < 0)
+  if (CJS_PrintParamsObj::Init(GetIsolate(), JS_DYNAMIC) < 0)
     return FALSE;
 
   return TRUE;
 }
 
 IFXJS_Context* CJS_Runtime::NewContext() {
   CJS_Context* p = new CJS_Context(this);
   m_ContextArray.Add(p);
   return p;
 }
@@ skipping 19 matching lines @@
 void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) {
   if (m_pDocument != pReaderDoc) {
     v8::Isolate::Scope isolate_scope(m_isolate);
     v8::Locker locker(m_isolate);
     v8::HandleScope handle_scope(m_isolate);
     v8::Local<v8::Context> context =
         v8::Local<v8::Context>::New(m_isolate, m_context);
     v8::Context::Scope context_scope(context);
 
     m_pDocument = pReaderDoc;
-
     if (pReaderDoc) {
-      JSObject pThis = JS_GetThisObj(*this);
+      v8::Local<v8::Object> pThis = JS_GetThisObj(GetIsolate());
       if (!pThis.IsEmpty()) {
-        if (JS_GetObjDefnID(pThis) == JS_GetObjDefnID(*this, L"Document")) {
+        if (JS_GetObjDefnID(pThis) ==
+            JS_GetObjDefnID(GetIsolate(), L"Document")) {
           if (CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pThis)) {
             if (Document* pDocument = (Document*)pJSDocument->GetEmbedObject())
               pDocument->AttachDoc(pReaderDoc);
           }
         }
       }
-      JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"Document"));
-    } else {
-      JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"app"));
     }
   }
 }
 
 FX_BOOL CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName,
                                     JS_EVENT_T eEventType) {
   if (m_pFieldEventPath == NULL) {
     m_pFieldEventPath = new CJS_FieldEvent;
     m_pFieldEventPath->sTargetName = sTargetName;
     m_pFieldEventPath->eEventType = eEventType;
@@ skipping 113 matching lines @@
   // 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;
 }