Make CPDFXFA_App / IXFA_AppProvider saner

fpdfsdk/src/fsdk_mgr.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 "../../public/fpdf_ext.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
@@ skipping 197 matching lines @@
 void CFX_SystemHandler::KillTimer(FX_INT32 nID)
 {
         m_pEnv->FFI_KillTimer(nID);
 }
 
 FX_SYSTEMTIME CFX_SystemHandler::GetLocalTime()
 {
         return m_pEnv->FFI_GetLocalTime();
 }
 
-
-
 CPDFDoc_Environment::CPDFDoc_Environment(CPDFXFA_Document* pDoc) :
         m_pAnnotHandlerMgr(NULL),
         m_pActionHandler(NULL),
         m_pJSRuntime(NULL),
         m_pInfo(NULL),
         m_pSDKDoc(NULL),
         m_pDoc(pDoc),
         m_pIFormFiller(NULL)
 {
-
         m_pSysHandler = NULL;
         m_pSysHandler = new CFX_SystemHandler(this);
-
-        //m_pJSRuntimeFactory = pDoc->GetApp()->GetRuntimeFactory();
-        
 }
 
 CPDFDoc_Environment::~CPDFDoc_Environment()
 {
 
-        if ( m_pIFormFiller )
-        {
-                delete m_pIFormFiller;
-                m_pIFormFiller = NULL;
-        }
+    delete m_pIFormFiller;
+    m_pIFormFiller = NULL;
 
-        if (m_pJSRuntime && FPDFXFA_GetApp()->GetRuntimeFactory())
-                FPDFXFA_GetApp()->GetRuntimeFactory()->DeleteJSRuntime(m_pJSRuntime);
+    CPDFXFA_App* pProvider = CPDFXFA_App::GetInstance();
+    if (m_pJSRuntime && pProvider->GetRuntimeFactory())
+        pProvider->GetRuntimeFactory()->DeleteJSRuntime(m_pJSRuntime);
 
-        if (FPDFXFA_GetApp()->m_pEnvList.GetSize() == 0)
-        {
-                FPDFXFA_GetApp()->ReleaseRuntime();
-                FPDFXFA_GetApp()->InitRuntime(TRUE);
-        }
+    if (pProvider->m_pEnvList.GetSize() == 0)
+    {
+        pProvider->ReleaseRuntime();
+        pProvider->InitRuntime(TRUE);
+    }
 
-        if(m_pSysHandler)
-        {
-                delete m_pSysHandler;
-                m_pSysHandler = NULL;
-        }
+    delete m_pSysHandler;
+    m_pSysHandler = NULL;
 
-        if(m_pAnnotHandlerMgr)
-        {
-                delete m_pAnnotHandlerMgr;
-                m_pAnnotHandlerMgr = NULL;
-        }
-        if(m_pActionHandler)
-        {
-                delete m_pActionHandler;
-                m_pActionHandler = NULL;
-        }
+    delete m_pAnnotHandlerMgr;
+    m_pAnnotHandlerMgr = NULL;
 
-
+    delete m_pActionHandler;
+    m_pActionHandler = NULL;
 }
 
 
 IFXJS_Runtime* CPDFDoc_Environment::GetJSRuntime()
 {
         if(!IsJSInitiated())
                 return NULL;
         if(!m_pJSRuntime)
-                m_pJSRuntime = FPDFXFA_GetApp()->GetRuntimeFactory()->NewJSRuntime(this);
+                m_pJSRuntime = CPDFXFA_App::GetInstance()->GetRuntimeFactory()->NewJSRuntime(this);
         return m_pJSRuntime;
 }
 
 CPDFSDK_AnnotHandlerMgr* CPDFDoc_Environment::GetAnnotHandlerMgr()
 {
         if(!m_pAnnotHandlerMgr)
                 m_pAnnotHandlerMgr = new CPDFSDK_AnnotHandlerMgr(this);
         return m_pAnnotHandlerMgr;
 }
 
@@ skipping 959 matching lines @@
         
         for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pAnnot == pFocusAnnot)
                         return pAnnot;
         }
         return NULL;
 }