Remove backpointer to runtime from CJS_Array.

fpdfsdk/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 "fpdfsdk/javascript/app.h"
 
 #include <memory>
 #include <vector>
@@ skipping 95 matching lines @@
 FX_BOOL app::activeDocs(IJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (!vp.IsGetting())
     return FALSE;
 
   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);
+  CJS_Array aDocs;
   if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument()) {
     CJS_Document* pJSDocument = nullptr;
     if (pDoc == pCurDoc) {
       v8::Local<v8::Object> pObj = FXJS_GetThisObj(pRuntime->GetIsolate());
       if (FXJS_GetObjDefnID(pObj) == CJS_Document::g_nObjDefnID)
         pJSDocument =
             (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pObj);
     } else {
       v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(
           pRuntime->GetIsolate(), pRuntime, CJS_Document::g_nObjDefnID);
       pJSDocument =
           (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pObj);
       ASSERT(pJSDocument);
     }
-    aDocs.SetElement(0, CJS_Value(pRuntime, pJSDocument));
+    aDocs.SetElement(pRuntime->GetIsolate(), 0,
+                     CJS_Value(pRuntime, pJSDocument));
   }
   if (aDocs.GetLength() > 0)
     vp << aDocs;
   else
     vp.SetNull();
 
   return TRUE;
 }
 
 FX_BOOL app::calculate(IJS_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;
     CPDFDoc_Environment* pApp = pContext->GetReaderApp();
-    CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-    CJS_Array aDocs(pRuntime);
+    // CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[Lei Zhang, 2016/08/05 17:41:58]

Delete?

[Tom Sepez, 2016/08/08 16:25:50]

Done.

+    CJS_Array aDocs;
     if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument())
       pDoc->GetInterForm()->EnableCalculate((FX_BOOL)m_bCalculate);
   } else {
     vp << (bool)m_bCalculate;
   }
   return TRUE;
 }
 
 FX_BOOL app::formsVersion(IJS_Context* cc,
                           CJS_PropValue& vp,
@@ skipping 118 matching lines @@
   std::vector<CJS_Value> newParams = JS_ExpandKeywordParams(
       pRuntime, params, 4, L"cMsg", L"nIcon", L"nType", L"cTitle");
 
   if (newParams[0].GetType() == CJS_Value::VT_unknown) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   CFX_WideString swMsg;
   if (newParams[0].GetType() == CJS_Value::VT_object) {
-    CJS_Array carray(pRuntime);
+    CJS_Array carray;
     if (newParams[0].ConvertToArray(carray)) {
       swMsg = L"[";
       CJS_Value element(pRuntime);
       for (int i = 0; i < carray.GetLength(); ++i) {
         if (i)
           swMsg += L", ";
-        carray.GetElement(i, element);
+        carray.GetElement(pRuntime->GetIsolate(), i, element);
         swMsg += element.ToCFXWideString();
       }
       swMsg += L"]";
     } else {
       swMsg = newParams[0].ToCFXWideString();
     }
   } else {
     swMsg = newParams[0].ToCFXWideString();
   }
 
@@ skipping 408 matching lines @@
 FX_BOOL app::media(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL app::execDialog(IJS_Context* cc,
                         const std::vector<CJS_Value>& params,
                         CJS_Value& vRet,
                         CFX_WideString& sError) {
   return TRUE;
 }