Inflict PDF_ENABLE_XFA ifdefs on XFA fpdfsdk/

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 "JS_Runtime.h"
 
+#ifdef PDF_ENABLE_XFA
 #include "../../../xfa/src/fxjse/src/value.h"
 #include "../../include/fpdfxfa/fpdfxfa_app.h"
+#endif
 #include "Consts.h"
 #include "Document.h"
 #include "Field.h"
 #include "Icon.h"
 #include "JS_Context.h"
 #include "JS_Define.h"
 #include "JS_EventHandler.h"
 #include "JS_GlobalData.h"
 #include "JS_Object.h"
 #include "JS_Value.h"
@@ skipping 23 matching lines @@
   const CJS_Context* pContext = static_cast<const CJS_Context*>(cc);
   return pContext->GetJSRuntime();
 }
 
 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
     : m_pApp(pApp),
       m_pDocument(NULL),
       m_bBlocking(FALSE),
       m_isolate(NULL),
       m_isolateManaged(false) {
+#ifndef PDF_ENABLE_XFA

[Lei Zhang, 2015/11/25 00:34:31]

Needs some manual merging here.

[Tom Sepez, 2015/11/25 21:45:30]

Yah, I've not jumped off this bridge yet.

+  IPDF_JSPLATFORM* pPlatform = m_pApp->GetFormFillInfo()->m_pJsPlatform;
+  if (pPlatform->version <= 2) {
+    unsigned int embedderDataSlot = 0;
+    v8::Isolate* pExternalIsolate = nullptr;
+    if (pPlatform->version == 2) {
+      pExternalIsolate = reinterpret_cast<v8::Isolate*>(pPlatform->m_isolate);
+      embedderDataSlot = pPlatform->m_v8EmbedderSlot;
+#else
   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 {
     IPDF_JSPLATFORM* pPlatform = m_pApp->GetFormFillInfo()->m_pJsPlatform;
     if (pPlatform->version <= 2) {
       unsigned int embedderDataSlot = 0;
       v8::Isolate* pExternalIsolate = nullptr;
       if (pPlatform->version == 2) {
         pExternalIsolate = reinterpret_cast<v8::Isolate*>(pPlatform->m_isolate);
         embedderDataSlot = pPlatform->m_v8EmbedderSlot;
       }
       FXJS_Initialize(embedderDataSlot, pExternalIsolate);
+#endif
     }
+#ifndef PDF_ENABLE_XFA
+    FXJS_Initialize(embedderDataSlot, pExternalIsolate);
+#else
     m_isolateManaged = FXJS_GetIsolate(&m_isolate);
   }
 
   v8::Isolate* isolate = m_isolate;
   v8::Isolate::Scope isolate_scope(isolate);
   v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   if (CPDFXFA_App::GetInstance()->IsJavaScriptInitialized()) {
     CJS_Context* pContext = (CJS_Context*)NewContext();
     FXJS_InitializeRuntime(GetIsolate(), this, &m_context, &m_StaticObjects);
     ReleaseContext(pContext);
     return;
+#endif
   }
+#ifndef PDF_ENABLE_XFA
+  m_isolateManaged = FXJS_GetIsolate(&m_isolate);
+#else
 
+#endif
   if (m_isolateManaged || FXJS_GlobalIsolateRefCount() == 0)
     DefineJSObjects();
 
+#ifdef PDF_ENABLE_XFA
   CPDFXFA_App::GetInstance()->SetJavaScriptInitialized(TRUE);
 
+#endif
   CJS_Context* pContext = (CJS_Context*)NewContext();
   FXJS_InitializeRuntime(GetIsolate(), this, &m_context, &m_StaticObjects);
   ReleaseContext(pContext);
 }
 
 CJS_Runtime::~CJS_Runtime() {
   for (auto* obs : m_observers)
     obs->OnDestroyed();
 
   for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++)
     delete m_ContextArray.GetAt(i);
 
   m_ContextArray.RemoveAll();
+#ifndef PDF_ENABLE_XFA
+  FXJS_ReleaseRuntime(GetIsolate(), &m_context, &m_StaticObjects);
+#endif
 
   m_pApp = NULL;
   m_pDocument = NULL;
   m_context.Reset();
 
   if (m_isolateManaged)
     m_isolate->Dispose();
 }
 
 void CJS_Runtime::DefineJSObjects() {
   v8::Isolate::Scope isolate_scope(GetIsolate());
+#ifdef PDF_ENABLE_XFA
   v8::Locker locker(GetIsolate());
+#endif
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
   v8::Context::Scope context_scope(context);
 
   // The call order determines the "ObjDefID" assigned to each class.
   // ObjDefIDs 0 - 2
   CJS_Border::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
   CJS_Display::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
   CJS_Font::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
@@ skipping 52 matching lines @@
 
 IJS_Context* CJS_Runtime::GetCurrentContext() {
   if (!m_ContextArray.GetSize())
     return NULL;
   return m_ContextArray.GetAt(m_ContextArray.GetSize() - 1);
 }
 
 void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) {
   if (m_pDocument != pReaderDoc) {
     v8::Isolate::Scope isolate_scope(m_isolate);
+#ifdef PDF_ENABLE_XFA
     v8::Locker locker(m_isolate);
+#endif
     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) {
       v8::Local<v8::Object> pThis = FXJS_GetThisObj(GetIsolate());
       if (!pThis.IsEmpty()) {
         if (FXJS_GetObjDefnID(pThis) == CJS_Document::g_nObjDefnID) {
@@ skipping 25 matching lines @@
 }
 
 void CJS_Runtime::RemoveEventFromSet(const FieldEvent& event) {
   m_FieldEventSet.erase(event);
 }
 
 v8::Local<v8::Context> CJS_Runtime::NewJSContext() {
   return v8::Local<v8::Context>::New(m_isolate, m_context);
 }
 
+#ifdef PDF_ENABLE_XFA
 CFX_WideString ChangeObjName(const CFX_WideString& str) {
   CFX_WideString sRet = str;
   sRet.Replace(L"_", L".");
   return sRet;
 }
 FX_BOOL CJS_Runtime::GetHValueByName(const CFX_ByteStringC& utf8Name,
                                      FXJSE_HVALUE hValue) {
 #ifdef PDF_ENABLE_XFA
   const FX_CHAR* name = utf8Name.GetCStr();
 
@@ skipping 46 matching lines @@
   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);
 #endif
   return TRUE;
 }
 
+#endif
 void CJS_Runtime::AddObserver(Observer* observer) {
   ASSERT(m_observers.find(observer) == m_observers.end());
   m_observers.insert(observer);
 }
 
 void CJS_Runtime::RemoveObserver(Observer* observer) {
   ASSERT(m_observers.find(observer) != m_observers.end());
   m_observers.erase(observer);
 }