Make CPDFXFA_App / IXFA_AppProvider saner

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 96 matching lines @@
 
 /* ------------------------------ 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_bRegistered(FALSE),
         m_pFieldEventPath(NULL)
 {
-        if (FPDFXFA_GetApp()->GetJSERuntime()) {
-                m_isolate = (v8::Isolate*)FPDFXFA_GetApp()->GetJSERuntime();
+        if (CPDFXFA_App::GetInstance()->GetJSERuntime()) {
+                m_isolate = (v8::Isolate*)CPDFXFA_App::GetInstance()->GetJSERuntime();
         } else {
                 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 (FPDFXFA_GetApp()->InitRuntime(FALSE)) {
+        if (CPDFXFA_App::GetInstance()->InitRuntime(FALSE)) {
                 CJS_Context * pContext = (CJS_Context*)NewContext();
                 JS_InitialRuntime(*this, this, pContext, m_context);
                 ReleaseContext(pContext);
                 return;
         }
 
         InitJSObjects();
 
         CJS_Context * pContext = (CJS_Context*)NewContext();
         JS_InitialRuntime(*this, this, pContext, m_context);
@@ skipping 253 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;
 }