Make CPDFXFA_App / IXFA_AppProvider saner

fpdfsdk/src/javascript/global.cpp

Index: fpdfsdk/src/javascript/global.cpp
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index daf5a85ffe5eb693a3f3a86a935d4f527bf5796d..f139380b20c944eeefd26c861f6cf88ddad8be2b 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -119,22 +119,17 @@ global_alternate::global_alternate(CJS_Object* pJSObject)
 global_alternate::~global_alternate(void)
 {
 	ASSERT(m_pApp != NULL);
-
-//	CommitGlobalPersisitentVariables();
 	DestroyGlobalPersisitentVariables();
 
-	CJS_RuntimeFactory* pFactory = FPDFXFA_GetApp()->GetRuntimeFactory();
-	ASSERT(pFactory);
-
+	CJS_RuntimeFactory* pFactory = CPDFXFA_App::GetInstance()->GetRuntimeFactory();
 	pFactory->ReleaseGlobalData();
 }
-  
+
 void global_alternate::Initial(CPDFDoc_Environment* pApp)
 {
 	m_pApp = pApp;
 
-	CJS_RuntimeFactory* pFactory = FPDFXFA_GetApp()->GetRuntimeFactory();
-	ASSERT(pFactory);
+	CJS_RuntimeFactory* pFactory = CPDFXFA_App::GetInstance()->GetRuntimeFactory();
 	m_pGlobalData = pFactory->NewGlobalData(pApp);
 	UpdateGlobalPersistentVariables();
 }