Cleanup some cjs_runtime ifdefs.

fpdfsdk/javascript/cjs_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 "fpdfsdk/javascript/cjs_runtime.h"
 
 #include <algorithm>
 
@@ skipping 46 matching lines @@
       m_isolate(nullptr),
       m_isolateManaged(false) {
 #ifndef PDF_ENABLE_XFA
   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;
+    }
+

[Tom Sepez, 2016/06/09 21:07:15]

nit: no blank line here.

[dsinclair, 2016/06/09 21:09:29]

Done.

+    FXJS_Initialize(embedderDataSlot, pExternalIsolate);
+  }
+  m_isolateManaged = FXJS_GetIsolate(&m_isolate);
 #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::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
 
-#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();
 
   m_ContextArray.clear();
@@ skipping 117 matching lines @@
 
 void CJS_Runtime::SetConstArray(const CFX_WideString& name,
                                 v8::Local<v8::Array> array) {
   m_ConstArrays[name] = v8::Global<v8::Array>(m_isolate, array);
 }
 
 v8::Local<v8::Array> CJS_Runtime::GetConstArray(const CFX_WideString& name) {
   return v8::Local<v8::Array>::New(m_isolate, m_ConstArrays[name]);
 }
 
+void CJS_Runtime::AddObserver(Observer* observer) {
+  ASSERT(!pdfium::ContainsKey(m_observers, observer));
+  m_observers.insert(observer);
+}
+
+void CJS_Runtime::RemoveObserver(Observer* observer) {
+  ASSERT(pdfium::ContainsKey(m_observers, observer));
+  m_observers.erase(observer);
+}
+
 #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::GetValueByName(const CFX_ByteStringC& utf8Name,
                                     CFXJSE_Value* pValue) {
-#ifdef PDF_ENABLE_XFA
   const FX_CHAR* name = utf8Name.c_str();
 
   v8::Isolate::Scope isolate_scope(GetIsolate());
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> old_context = GetIsolate()->GetCurrentContext();
   v8::Local<v8::Context> context =
       v8::Local<v8::Context>::New(GetIsolate(), m_context);
   v8::Context::Scope context_scope(context);
 
   // Caution: We're about to hand to XFA an object that in order to invoke
   // methods will require that the current v8::Context always has a pointer
   // to a CJS_Runtime in its embedder data slot. Unfortunately, XFA creates
   // its own v8::Context which has not initialized the embedder data slot.
   // Do so now.
   // TODO(tsepez): redesign PDF-side objects to not rely on v8::Context's
   // embedder data slots, and/or to always use the right context.
   FXJS_SetRuntimeForV8Context(old_context, this);
 
   v8::Local<v8::Value> propvalue =
       context->Global()->Get(v8::String::NewFromUtf8(
           GetIsolate(), name, v8::String::kNormalString, utf8Name.GetLength()));
 
   if (propvalue.IsEmpty()) {
     pValue->SetUndefined();
     return FALSE;
   }
   pValue->ForceSetValue(propvalue);
-#endif
-
   return TRUE;
 }
 FX_BOOL CJS_Runtime::SetValueByName(const CFX_ByteStringC& utf8Name,
                                     CFXJSE_Value* pValue) {
-#ifdef PDF_ENABLE_XFA
   if (utf8Name.IsEmpty() || !pValue)
     return FALSE;
   const FX_CHAR* name = utf8Name.c_str();
   v8::Isolate* pIsolate = GetIsolate();
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   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(), pValue->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(!pdfium::ContainsKey(m_observers, observer));
-  m_observers.insert(observer);
-}
-
-void CJS_Runtime::RemoveObserver(Observer* observer) {
-  ASSERT(pdfium::ContainsKey(m_observers, observer));
-  m_observers.erase(observer);
-}