Remove backpointer to CJS_Runtime from CJS_Value

fpdfsdk/javascript/global.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/global.h"
 
 #include <vector>
 
@@ skipping 63 matching lines @@
     return FALSE;
 
   it->second->bDeleted = TRUE;
   return TRUE;
 }
 
 FX_BOOL JSGlobalAlternate::DoProperty(IJS_Context* cc,
                                       const FX_WCHAR* propname,
                                       CJS_PropValue& vp,
                                       CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   if (vp.IsSetting()) {
     CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
-    switch (vp.GetType()) {
+    switch (vp.GetJSValue()->GetType()) {
       case CJS_Value::VT_number: {
         double dData;
         vp >> dData;
         return SetGlobalVariables(sPropName, JS_GlobalDataType::NUMBER, dData,
                                   false, "", v8::Local<v8::Object>(), FALSE);
       }
       case CJS_Value::VT_boolean: {
         bool bData;
         vp >> bData;
         return SetGlobalVariables(sPropName, JS_GlobalDataType::BOOLEAN, 0,
@@ skipping 18 matching lines @@
       case CJS_Value::VT_undefined: {
         DelProperty(cc, propname, sError);
         return TRUE;
       }
       default:
         break;
     }
   } else {
     auto it = m_mapGlobal.find(CFX_ByteString::FromUnicode(propname));
     if (it == m_mapGlobal.end()) {
-      vp.SetNull();
+      vp.GetJSValue()->SetNull(pRuntime);
       return TRUE;
     }
     JSGlobalData* pData = it->second;
     if (pData->bDeleted) {
-      vp.SetNull();
+      vp.GetJSValue()->SetNull(pRuntime);
       return TRUE;
     }
     switch (pData->nType) {
       case JS_GlobalDataType::NUMBER:
         vp << pData->dData;
         return TRUE;
       case JS_GlobalDataType::BOOLEAN:
         vp << pData->bData;
         return TRUE;
       case JS_GlobalDataType::STRING:
         vp << pData->sData;
         return TRUE;
       case JS_GlobalDataType::OBJECT: {
         v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(
             vp.GetJSRuntime()->GetIsolate(), pData->pData);
         vp << obj;
         return TRUE;
       }
       case JS_GlobalDataType::NULLOBJ:
-        vp.SetNull();
+        vp.GetJSValue()->SetNull(pRuntime);
         return TRUE;
       default:
         break;
     }
   }
   return FALSE;
 }
 
 FX_BOOL JSGlobalAlternate::setPersistent(IJS_Context* cc,
                                          const std::vector<CJS_Value>& params,
                                          CJS_Value& vRet,
                                          CFX_WideString& sError) {
   CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   if (params.size() != 2) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  auto it = m_mapGlobal.find(params[0].ToCFXByteString());
+  auto it = m_mapGlobal.find(params[0].ToCFXByteString(pRuntime->GetIsolate()));
   if (it != m_mapGlobal.end()) {
     JSGlobalData* pData = it->second;
     if (!pData->bDeleted) {
-      pData->bPersistent = params[1].ToBool();
+      pData->bPersistent = params[1].ToBool(pRuntime->GetIsolate());
       return TRUE;
     }
   }
 
   sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
   return FALSE;
 }
 
 void JSGlobalAlternate::UpdateGlobalPersistentVariables() {
   for (int i = 0, sz = m_pGlobalData->GetSize(); i < sz; i++) {
@@ skipping 80 matching lines @@
       }
     }
   }
 }
 
 void JSGlobalAlternate::ObjectToArray(IJS_Context* cc,
                                       v8::Local<v8::Object> pObj,
                                       CJS_GlobalVariableArray& array) {
   v8::Isolate* isolate = pObj->GetIsolate();
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
-
   v8::Local<v8::Array> pKeyList = FXJS_GetObjectElementNames(isolate, pObj);
   int nObjElements = pKeyList->Length();
   for (int i = 0; i < nObjElements; i++) {
     CFX_WideString ws =
         FXJS_ToString(isolate, FXJS_GetArrayElement(isolate, pKeyList, i));
     CFX_ByteString sKey = ws.UTF8Encode();
     v8::Local<v8::Value> v = FXJS_GetObjectElement(isolate, pObj, ws);
     switch (CJS_Value::GetValueType(v)) {
       case CJS_Value::VT_number: {
         CJS_KeyValue* pObjElement = new CJS_KeyValue;
         pObjElement->nType = JS_GlobalDataType::NUMBER;
         pObjElement->sKey = sKey;
         pObjElement->dData = FXJS_ToNumber(isolate, v);
         array.Add(pObjElement);
       } break;
       case CJS_Value::VT_boolean: {
         CJS_KeyValue* pObjElement = new CJS_KeyValue;
         pObjElement->nType = JS_GlobalDataType::BOOLEAN;
         pObjElement->sKey = sKey;
         pObjElement->dData = FXJS_ToBoolean(isolate, v);
         array.Add(pObjElement);
       } break;
       case CJS_Value::VT_string: {
-        CFX_ByteString sValue = CJS_Value(pRuntime, v).ToCFXByteString();
+        CFX_ByteString sValue =
+            CJS_Value(pRuntime, v).ToCFXByteString(pRuntime->GetIsolate());
         CJS_KeyValue* pObjElement = new CJS_KeyValue;
         pObjElement->nType = JS_GlobalDataType::STRING;
         pObjElement->sKey = sKey;
         pObjElement->sData = sValue;
         array.Add(pObjElement);
       } break;
       case CJS_Value::VT_object: {
         CJS_KeyValue* pObjElement = new CJS_KeyValue;
         pObjElement->nType = JS_GlobalDataType::OBJECT;
         pObjElement->sKey = sKey;
@@ skipping 125 matching lines @@
       pNewData->nType = JS_GlobalDataType::NULLOBJ;
       pNewData->bPersistent = bDefaultPersistent;
     } break;
     default:
       return FALSE;
   }
 
   m_mapGlobal[propname] = pNewData;
   return TRUE;
 }