commit 371379dcdc2e277b626650064394d989e35c917f
author Tom Sepez <tsepez@chromium.org> Fri Nov 06 08:29:39 2015 -0800
committer Tom Sepez <tsepez@chromium.org> Fri Nov 06 08:29:39 2015 -0800
tree 44240ba40fec7d7252a3e4c3401f47a8ebc2b6af
parent 476ac131cfd55842383f65418658a5f1103785b4

Merge to XFA: Remove FXJS_GetRuntime

Original Review URL: https://codereview.chromium.org/1413733004 .
(cherry picked from commit 93f191bb011508a8d4e66746135e8ba8e9583870)

TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/1435493002 .

fpdfsdk/src/javascript/global.cpp

diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index cd0048d..4dd93c1 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -259,7 +259,7 @@
                              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);
@@ -324,8 +324,7 @@
 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);
@@ -401,7 +400,7 @@
                              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);
@@ -454,7 +453,7 @@
         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;
@@ -488,7 +487,7 @@
     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: {