Merge to XFA: Tidy up CPDFDOC_Environment.

fpdfsdk/src/javascript/global.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/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_EventHandler.h"
@@ skipping 100 matching lines @@
 };
 
 global_alternate::global_alternate(CJS_Object* pJSObject)
         : CJS_EmbedObj(pJSObject),
         m_pApp(NULL)
 {
 }
 
 global_alternate::~global_alternate(void)
 {
-        ASSERT(m_pApp != NULL);
         DestroyGlobalPersisitentVariables();
-
-        CJS_RuntimeFactory* pFactory = CPDFXFA_App::GetInstance()->GetRuntimeFactory();
-        pFactory->ReleaseGlobalData();
+        CPDFXFA_App::GetInstance()->GetRuntimeFactory()->ReleaseGlobalData();
 }
 
 void global_alternate::Initial(CPDFDoc_Environment* pApp)
 {
         m_pApp = pApp;
-
-        CJS_RuntimeFactory* pFactory = CPDFXFA_App::GetInstance()->GetRuntimeFactory();
-        m_pGlobalData = pFactory->NewGlobalData(pApp);
+        m_pGlobalData = CPDFXFA_App::GetInstance()->GetRuntimeFactory()->NewGlobalData(pApp);
         UpdateGlobalPersistentVariables();
 }
 
 FX_BOOL global_alternate::QueryProperty(const FX_WCHAR* propname)
 {
         return CFX_WideString(propname) != L"setPersistent";
 }
 
 FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError)
 {
@@ skipping 475 matching lines @@
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }