Tidy up CPDFDOC_Environment.

fpdfsdk/src/javascript/app.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 "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
@@ skipping 101 matching lines @@
         JS_STATIC_METHOD_ENTRY(openFDF)
         JS_STATIC_METHOD_ENTRY(popUpMenuEx)
         JS_STATIC_METHOD_ENTRY(popUpMenu)
         JS_STATIC_METHOD_ENTRY(response)
         JS_STATIC_METHOD_ENTRY(setInterval)
         JS_STATIC_METHOD_ENTRY(setTimeOut)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_JS_CLASS(CJS_App,app)
 
-app::app(CJS_Object * pJSObject) : CJS_EmbedObj(pJSObject) ,
+app::app(CJS_Object * pJSObject) :

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

':' on next line

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

Done.

+    CJS_EmbedObj(pJSObject),
         m_bCalculate(true),
         m_bRuntimeHighLight(false)
-//      m_pMenuHead(NULL)
 {
 }
 
 app::~app(void)
 {
         for (int i=0,sz=m_aTimer.GetSize(); i<sz; i++)
                 delete m_aTimer[i];
 
         m_aTimer.RemoveAll();
 }
 
 FX_BOOL app::activeDocs(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (vp.IsGetting())
-        {
+    if (vp.IsGetting())

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

if (!vp.IsGetting())
    return FALSE:

// unindent everything else

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

Done.

+    {
+        CJS_Context* pContext = (CJS_Context *)cc;
+        CPDFDoc_Environment* pApp = pContext->GetReaderApp();
+        CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+        CPDFSDK_Document* pCurDoc = pContext->GetReaderDocument();
+        CJS_Array aDocs(pRuntime->GetIsolate());
+        if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
+        {
+            CJS_Document* pJSDocument = NULL;
+            if (pDoc == pCurDoc)
+            {
+                JSFXObject pObj = JS_GetThisObj(*pRuntime);
+                if (JS_GetObjDefnID(pObj) == JS_GetObjDefnID(*pRuntime, L"Document"))
+                    pJSDocument = (CJS_Document*)JS_GetPrivate(pRuntime->GetIsolate(),pObj);
+            }
+            else
+            {
+                JSFXObject pObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime,L"Document"));
+                pJSDocument = (CJS_Document*)JS_GetPrivate(pRuntime->GetIsolate(),pObj);
+                ASSERT(pJSDocument != NULL);
+            }
+            aDocs.SetElement(0,CJS_Value(pRuntime->GetIsolate(),pJSDocument));
+        }
+        if (aDocs.GetLength() > 0)
+            vp << aDocs;
+        else
+            vp.SetNull();
 
-                CJS_Context* pContext = (CJS_Context *)cc;
-                ASSERT(pContext != NULL);
-
-                CPDFDoc_Environment* pApp = pContext->GetReaderApp();
-                ASSERT(pApp != NULL);
-
-                CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-                ASSERT(pRuntime != NULL);
-
-                CPDFSDK_Document* pCurDoc = pContext->GetReaderDocument();
-
-                CJS_Array aDocs(pRuntime->GetIsolate());
-//              int iNumDocs = pApp->CountDocuments();
-
-//              for(int iIndex = 0; iIndex<iNumDocs; iIndex++)
-//              {
-                        CPDFSDK_Document* pDoc = pApp->GetCurrentDoc();
-                        if (pDoc)
-                        {
-                                CJS_Document * pJSDocument = NULL;
-
-                                if (pDoc == pCurDoc)
-                                {
-                                        JSFXObject pObj = JS_GetThisObj(*pRuntime);
-
-                                        if (JS_GetObjDefnID(pObj) == JS_GetObjDefnID(*pRuntime, L"Document"))
-                                        {
-                                                pJSDocument = (CJS_Document*)JS_GetPrivate(pRuntime->GetIsolate(),pObj);
-                                        }
-                                }
-                                else
-                                {
-                                        JSFXObject pObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime,L"Document"));
-                                        pJSDocument = (CJS_Document*)JS_GetPrivate(pRuntime->GetIsolate(),pObj);
-                                        ASSERT(pJSDocument != NULL);
-
-
-                                        //                      pDocument->AttachDoc(pDoc);
-                                }
-
-                                aDocs.SetElement(0,CJS_Value(pRuntime->GetIsolate(),pJSDocument));
-                        }
-        //              }
-
-                if (aDocs.GetLength() > 0)
-                        vp << aDocs;
-                else
-                        vp.SetNull();
-                return TRUE;
-        }
-        return FALSE;
+        return TRUE;
+    }
+    return FALSE;
 }
 
 FX_BOOL app::calculate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting())
         {
                 bool bVP;
                 vp >> bVP;
                 m_bCalculate = (FX_BOOL)bVP;
 
                 CJS_Context* pContext = (CJS_Context*)cc;
-                ASSERT(pContext != NULL);
-
                 CPDFDoc_Environment* pApp = pContext->GetReaderApp();
-                ASSERT(pApp != NULL);
-
                 CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-                ASSERT(pRuntime != NULL);
-
                 CJS_Array aDocs(pRuntime->GetIsolate());
-                if (CPDFSDK_Document* pDoc = pApp->GetCurrentDoc())
-                {
-                        CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDoc->GetInterForm();
-                        ASSERT(pInterForm != NULL);
-                        pInterForm->EnableCalculate((FX_BOOL)m_bCalculate);
-                }
+                if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
+                        pDoc->GetInterForm()->EnableCalculate((FX_BOOL)m_bCalculate);
         }
         else
         {
                 vp << (bool)m_bCalculate;
         }
-
         return TRUE;
 }
 
 FX_BOOL app::formsVersion(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsGetting())
         {
                 vp << JS_NUM_FORMSVERSION;
                 return TRUE;
         }
@@ skipping 685 matching lines @@
 
 FX_BOOL app::media(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         return FALSE;
 }
 
 FX_BOOL app::execDialog(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         return TRUE;
 }