Tidy up CPDFDOC_Environment.

fpdfsdk/src/javascript/JS_Object.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_Define.h"
 #include "../../include/javascript/JS_Object.h"
-// #include "../../include/javascript/JS_MsgBox.h"
-// #include "../../include/javascript/JS_ResMgr.h"
 #include "../../include/javascript/JS_Context.h"
 
 JS_TIMER_MAPARRAY& GetTimeMap()
 {
   // Leak the timer array at shutdown.
   static auto* timeMap = new JS_TIMER_MAPARRAY;
   return *timeMap;
 }
 
 int FXJS_MsgBox(CPDFDoc_Environment* pApp, CPDFSDK_PageView* pPageView, const FX_WCHAR* swMsg, const FX_WCHAR* swTitle, FX_UINT nType, FX_UINT nIcon)
 {
-        int nRet = 0;
+        if (!pApp)

[Lei Zhang, 2015/07/16 17:05:06]

kill the tab

[Tom Sepez, 2015/07/16 18:01:28]

Untabified file.

+        return 0;
 
-        if(pApp)
-        {
-                CPDFSDK_Document* pDoc = pApp->GetCurrentDoc();
-                if(pDoc)
-                        pDoc->KillFocusAnnot();
-                nRet = pApp->JS_appAlert(swMsg, swTitle, nType, nIcon);
-        }
+    if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
+        pDoc->KillFocusAnnot();
 
-        return nRet;
+    return pApp->JS_appAlert(swMsg, swTitle, nType, nIcon);
 }
 
 CPDFSDK_PageView* FXJS_GetPageView(IFXJS_Context* cc)
 {
         if (CJS_Context* pContext = (CJS_Context *)cc)
         {
                 if (pContext->GetReaderDocument())
                         return NULL;
         }
         return NULL;
@@ skipping 100 matching lines @@
 
         if (pContext->IsMsgBoxEnabled())
         {
                 CPDFDoc_Environment* pApp = pContext->GetReaderApp();
                 if(pApp)
                         pApp->JS_appAlert(swMsg, NULL, 0, 3);
         }
 }