Merge to XFA: Remove FXJS_GetRuntime

fpdfsdk/src/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 "global.h"
 
 #include "../../../core/include/fxcrt/fx_ext.h"
 #include "../../include/javascript/IJavaScript.h"
@@ skipping 241 matching lines @@
         break;
       case JS_GLOBALDATA_TYPE_STRING:
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_STRING, 0,
                            false, pData->data.sData, v8::Local<v8::Object>(),
                            pData->bPersistent == 1);
         FXJS_PutObjectString(NULL, m_pJSObject->ToV8Object(),
                              pData->data.sKey.UTF8Decode().c_str(),
                              pData->data.sData.UTF8Decode().c_str());
         break;
       case JS_GLOBALDATA_TYPE_OBJECT: {
-        v8::Isolate* pRuntime = FXJS_GetRuntime(m_pJSObject->ToV8Object());
+        v8::Isolate* pRuntime = m_pJSObject->ToV8Object()->GetIsolate();
         v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(pRuntime, NULL, -1);
 
         PutObjectProperty(pObj, &pData->data);
 
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_OBJECT, 0,
                            false, "", pObj, pData->bPersistent == 1);
         FXJS_PutObjectObject(NULL, m_pJSObject->ToV8Object(),
                              pData->data.sKey.UTF8Decode().c_str(), pObj);
 
       } break;
@@ skipping 44 matching lines @@
           m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
           break;
       }
     }
   }
 }
 
 void JSGlobalAlternate::ObjectToArray(IJS_Context* cc,
                                       v8::Local<v8::Object> pObj,
                                       CJS_GlobalVariableArray& array) {
-  v8::Local<v8::Context> context = pObj->CreationContext();
-  v8::Isolate* isolate = context->GetIsolate();
+  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.c_str());
@@ skipping 55 matching lines @@
         break;
       case JS_GLOBALDATA_TYPE_BOOLEAN:
         FXJS_PutObjectBoolean(NULL, pObj, pObjData->sKey.UTF8Decode().c_str(),
                               pObjData->bData == 1);
         break;
       case JS_GLOBALDATA_TYPE_STRING:
         FXJS_PutObjectString(NULL, pObj, pObjData->sKey.UTF8Decode().c_str(),
                              pObjData->sData.UTF8Decode().c_str());
         break;
       case JS_GLOBALDATA_TYPE_OBJECT: {
-        v8::Isolate* pRuntime = FXJS_GetRuntime(m_pJSObject->ToV8Object());
+        v8::Isolate* pRuntime = m_pJSObject->ToV8Object()->GetIsolate();
         v8::Local<v8::Object> pNewObj =
             FXJS_NewFxDynamicObj(pRuntime, NULL, -1);
         PutObjectProperty(pNewObj, pObjData);
         FXJS_PutObjectObject(NULL, pObj, pObjData->sKey.UTF8Decode().c_str(),
                              pNewObj);
       } break;
       case JS_GLOBALDATA_TYPE_NULL:
         FXJS_PutObjectNull(NULL, pObj, pObjData->sKey.UTF8Decode().c_str());
         break;
     }
@@ skipping 32 matching lines @@
       case JS_GLOBALDATA_TYPE_NUMBER: {
         pTemp->dData = dData;
       } break;
       case JS_GLOBALDATA_TYPE_BOOLEAN: {
         pTemp->bData = bData;
       } break;
       case JS_GLOBALDATA_TYPE_STRING: {
         pTemp->sData = sData;
       } break;
       case JS_GLOBALDATA_TYPE_OBJECT: {
-        pTemp->pData.Reset(FXJS_GetRuntime(pData), pData);
+        pTemp->pData.Reset(pData->GetIsolate(), pData);
       } break;
       case JS_GLOBALDATA_TYPE_NULL:
         break;
       default:
         return FALSE;
     }
     return TRUE;
   }
 
   JSGlobalData* pNewData = NULL;
@@ skipping 13 matching lines @@
     } break;
     case JS_GLOBALDATA_TYPE_STRING: {
       pNewData = new JSGlobalData;
       pNewData->nType = JS_GLOBALDATA_TYPE_STRING;
       pNewData->sData = sData;
       pNewData->bPersistent = bDefaultPersistent;
     } break;
     case JS_GLOBALDATA_TYPE_OBJECT: {
       pNewData = new JSGlobalData;
       pNewData->nType = JS_GLOBALDATA_TYPE_OBJECT;
-      pNewData->pData.Reset(FXJS_GetRuntime(pData), pData);
+      pNewData->pData.Reset(pData->GetIsolate(), pData);
       pNewData->bPersistent = bDefaultPersistent;
     } break;
     case JS_GLOBALDATA_TYPE_NULL: {
       pNewData = new JSGlobalData;
       pNewData->nType = JS_GLOBALDATA_TYPE_NULL;
       pNewData->bPersistent = bDefaultPersistent;
     } break;
     default:
       return FALSE;
   }
@@ skipping 17 matching lines @@
     return CJS_Value::VT_boolean;
   if (nHash == JSCONST_nDateHash)
     return CJS_Value::VT_date;
   if (nHash == JSCONST_nObjectHash)
     return CJS_Value::VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return CJS_Value::VT_fxobject;
 
   return CJS_Value::VT_unknown;
 }