Remove backpointer to runtime from CJS_Array.

fpdfsdk/javascript/color.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/color.h"
 
 #include <vector>
 
@@ skipping 39 matching lines @@
   m_crCyan = CPWL_Color(COLORTYPE_CMYK, 1, 0, 0, 0);
   m_crMagenta = CPWL_Color(COLORTYPE_CMYK, 0, 1, 0, 0);
   m_crYellow = CPWL_Color(COLORTYPE_CMYK, 0, 0, 1, 0);
   m_crDKGray = CPWL_Color(COLORTYPE_GRAY, 0.25);
   m_crGray = CPWL_Color(COLORTYPE_GRAY, 0.5);
   m_crLTGray = CPWL_Color(COLORTYPE_GRAY, 0.75);
 }
 
 color::~color() {}
 
-void color::ConvertPWLColorToArray(const CPWL_Color& color, CJS_Array& array) {
+void color::ConvertPWLColorToArray(CJS_Runtime* pRuntime,
+                                   const CPWL_Color& color,
+                                   CJS_Array& array) {
   switch (color.nColorType) {
     case COLORTYPE_TRANSPARENT:
-      array.SetElement(0, CJS_Value(array.GetJSRuntime(), "T"));
+      array.SetElement(pRuntime->GetIsolate(), 0, CJS_Value(pRuntime, "T"));
       break;
     case COLORTYPE_GRAY:
-      array.SetElement(0, CJS_Value(array.GetJSRuntime(), "G"));
-      array.SetElement(1, CJS_Value(array.GetJSRuntime(), color.fColor1));
+      array.SetElement(pRuntime->GetIsolate(), 0, CJS_Value(pRuntime, "G"));
+      array.SetElement(pRuntime->GetIsolate(), 1,
+                       CJS_Value(pRuntime, color.fColor1));
       break;
     case COLORTYPE_RGB:
-      array.SetElement(0, CJS_Value(array.GetJSRuntime(), "RGB"));
-      array.SetElement(1, CJS_Value(array.GetJSRuntime(), color.fColor1));
-      array.SetElement(2, CJS_Value(array.GetJSRuntime(), color.fColor2));
-      array.SetElement(3, CJS_Value(array.GetJSRuntime(), color.fColor3));
+      array.SetElement(pRuntime->GetIsolate(), 0, CJS_Value(pRuntime, "RGB"));
+      array.SetElement(pRuntime->GetIsolate(), 1,
+                       CJS_Value(pRuntime, color.fColor1));
+      array.SetElement(pRuntime->GetIsolate(), 2,
+                       CJS_Value(pRuntime, color.fColor2));
+      array.SetElement(pRuntime->GetIsolate(), 3,
+                       CJS_Value(pRuntime, color.fColor3));
       break;
     case COLORTYPE_CMYK:
-      array.SetElement(0, CJS_Value(array.GetJSRuntime(), "CMYK"));
-      array.SetElement(1, CJS_Value(array.GetJSRuntime(), color.fColor1));
-      array.SetElement(2, CJS_Value(array.GetJSRuntime(), color.fColor2));
-      array.SetElement(3, CJS_Value(array.GetJSRuntime(), color.fColor3));
-      array.SetElement(4, CJS_Value(array.GetJSRuntime(), color.fColor4));
+      array.SetElement(pRuntime->GetIsolate(), 0, CJS_Value(pRuntime, "CMYK"));
+      array.SetElement(pRuntime->GetIsolate(), 1,
+                       CJS_Value(pRuntime, color.fColor1));
+      array.SetElement(pRuntime->GetIsolate(), 2,
+                       CJS_Value(pRuntime, color.fColor2));
+      array.SetElement(pRuntime->GetIsolate(), 3,
+                       CJS_Value(pRuntime, color.fColor3));
+      array.SetElement(pRuntime->GetIsolate(), 4,
+                       CJS_Value(pRuntime, color.fColor4));
       break;
   }
 }
 
-void color::ConvertArrayToPWLColor(CJS_Array& array, CPWL_Color& color) {
+void color::ConvertArrayToPWLColor(CJS_Runtime* pRuntime,
+                                   CJS_Array& array,
+                                   CPWL_Color& color) {
   int nArrayLen = array.GetLength();
   if (nArrayLen < 1)
     return;
 
-  CJS_Value value(array.GetJSRuntime());
-  array.GetElement(0, value);
+  CJS_Value value(pRuntime);
+  array.GetElement(pRuntime->GetIsolate(), 0, value);
   CFX_ByteString sSpace = value.ToCFXByteString();
 
   double d1 = 0;
   double d2 = 0;
   double d3 = 0;
   double d4 = 0;
 
   if (nArrayLen > 1) {
-    array.GetElement(1, value);
+    array.GetElement(pRuntime->GetIsolate(), 1, value);
     d1 = value.ToDouble();
   }
 
   if (nArrayLen > 2) {
-    array.GetElement(2, value);
+    array.GetElement(pRuntime->GetIsolate(), 2, value);
     d2 = value.ToDouble();
   }
 
   if (nArrayLen > 3) {
-    array.GetElement(3, value);
+    array.GetElement(pRuntime->GetIsolate(), 3, value);
     d3 = value.ToDouble();
   }
 
   if (nArrayLen > 4) {
-    array.GetElement(4, value);
+    array.GetElement(pRuntime->GetIsolate(), 4, value);
     d4 = value.ToDouble();
   }
 
   if (sSpace == "T") {
     color = CPWL_Color(COLORTYPE_TRANSPARENT);
   } else if (sSpace == "G") {
     color = CPWL_Color(COLORTYPE_GRAY, (FX_FLOAT)d1);
   } else if (sSpace == "RGB") {
     color = CPWL_Color(COLORTYPE_RGB, (FX_FLOAT)d1, (FX_FLOAT)d2, (FX_FLOAT)d3);
   } else if (sSpace == "CMYK") {
     color = CPWL_Color(COLORTYPE_CMYK, (FX_FLOAT)d1, (FX_FLOAT)d2, (FX_FLOAT)d3,
                        (FX_FLOAT)d4);
   }
 }
 
 #define JS_IMPLEMENT_COLORPROP(prop, var)                 \
   FX_BOOL color::prop(IJS_Context* cc, CJS_PropValue& vp, \
                       CFX_WideString& sError) {           \
     CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc); \
-    CJS_Array array(pRuntime);                            \
+    CJS_Array array;                                      \
     if (vp.IsGetting()) {                                 \
-      ConvertPWLColorToArray(var, array);                 \
+      ConvertPWLColorToArray(pRuntime, var, array);       \
       vp << array;                                        \
     } else {                                              \
       if (!vp.ConvertToArray(array))                      \
         return FALSE;                                     \
-      ConvertArrayToPWLColor(array, var);                 \
+      ConvertArrayToPWLColor(pRuntime, array, var);       \
     }                                                     \
     return TRUE;                                          \
   }
 
 JS_IMPLEMENT_COLORPROP(transparent, m_crTransparent)
 JS_IMPLEMENT_COLORPROP(black, m_crBlack)
 JS_IMPLEMENT_COLORPROP(white, m_crWhite)
 JS_IMPLEMENT_COLORPROP(red, m_crRed)
 JS_IMPLEMENT_COLORPROP(green, m_crGreen)
 JS_IMPLEMENT_COLORPROP(blue, m_crBlue)
 JS_IMPLEMENT_COLORPROP(cyan, m_crCyan)
 JS_IMPLEMENT_COLORPROP(magenta, m_crMagenta)
 JS_IMPLEMENT_COLORPROP(yellow, m_crYellow)
 JS_IMPLEMENT_COLORPROP(dkGray, m_crDKGray)
 JS_IMPLEMENT_COLORPROP(gray, m_crGray)
 JS_IMPLEMENT_COLORPROP(ltGray, m_crLTGray)
 
 FX_BOOL color::convert(IJS_Context* cc,
                        const std::vector<CJS_Value>& params,
                        CJS_Value& vRet,
                        CFX_WideString& sError) {
   int iSize = params.size();
   if (iSize < 2)
     return FALSE;
 
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
-  CJS_Array aSource(pRuntime);
+  CJS_Array aSource;
   if (!params[0].ConvertToArray(aSource))
     return FALSE;
 
   CPWL_Color crSource;
-  ConvertArrayToPWLColor(aSource, crSource);
+  ConvertArrayToPWLColor(pRuntime, aSource, crSource);
 
   CFX_ByteString sDestSpace = params[1].ToCFXByteString();
   int nColorType = COLORTYPE_TRANSPARENT;
 
   if (sDestSpace == "T") {
     nColorType = COLORTYPE_TRANSPARENT;
   } else if (sDestSpace == "G") {
     nColorType = COLORTYPE_GRAY;
   } else if (sDestSpace == "RGB") {
     nColorType = COLORTYPE_RGB;
   } else if (sDestSpace == "CMYK") {
     nColorType = COLORTYPE_CMYK;
   }
 
-  CJS_Array aDest(pRuntime);
+  CJS_Array aDest;
   CPWL_Color crDest = crSource;
   crDest.ConvertColorType(nColorType);
-  ConvertPWLColorToArray(crDest, aDest);
-  vRet = aDest;
+  ConvertPWLColorToArray(pRuntime, crDest, aDest);
+  vRet = CJS_Value(pRuntime, aDest);
 
   return TRUE;
 }
 
 FX_BOOL color::equal(IJS_Context* cc,
                      const std::vector<CJS_Value>& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
   if (params.size() < 2)
     return FALSE;
 
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
-  CJS_Array array1(pRuntime);
-  CJS_Array array2(pRuntime);
+  CJS_Array array1;
+  CJS_Array array2;
   if (!params[0].ConvertToArray(array1))
     return FALSE;
   if (!params[1].ConvertToArray(array2))
     return FALSE;
 
   CPWL_Color color1;
   CPWL_Color color2;
-  ConvertArrayToPWLColor(array1, color1);
-  ConvertArrayToPWLColor(array2, color2);
+  ConvertArrayToPWLColor(pRuntime, array1, color1);
+  ConvertArrayToPWLColor(pRuntime, array2, color2);
   color1.ConvertColorType(color2.nColorType);
   vRet = color1 == color2;
   return TRUE;
 }