commit 116e4addeecd2cb779b1ab590bea2d091ca12915
author Tom Sepez <tsepez@chromium.org> Mon Sep 21 09:22:05 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Mon Sep 21 09:22:05 2015 -0700
tree 1f313d843abb122a79b9272e17fb379292a89ffa
parent b2ed5de36ca387e0a9bbc3dfb9f5b568c7cc2ea8

Merge to XFA:More tidy of CJS_Object, kill implicit cast operator

(cherry picked from commit 270fc65d5824eeedbb2ed17516a72721bde9c9ef)
Original Review URL: https://codereview.chromium.org/1349423006 .

TBR=thestig@chromium.org

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

fpdfsdk/src/javascript/global.cpp

diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index 53dd731..0f90392 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -244,7 +244,7 @@
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NUMBER,
                            pData->data.dData, false, "",
                            v8::Local<v8::Object>(), pData->bPersistent == 1);
-        FXJS_PutObjectNumber(NULL, (v8::Local<v8::Object>)(*m_pJSObject),
+        FXJS_PutObjectNumber(NULL, m_pJSObject->ToV8Object(),
                              pData->data.sKey.UTF8Decode().c_str(),
                              pData->data.dData);
         break;
@@ -252,7 +252,7 @@
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_BOOLEAN, 0,
                            (bool)(pData->data.bData == 1), "",
                            v8::Local<v8::Object>(), pData->bPersistent == 1);
-        FXJS_PutObjectBoolean(NULL, (v8::Local<v8::Object>)(*m_pJSObject),
+        FXJS_PutObjectBoolean(NULL, m_pJSObject->ToV8Object(),
                               pData->data.sKey.UTF8Decode().c_str(),
                               (bool)(pData->data.bData == 1));
         break;
@@ -260,29 +260,27 @@
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_STRING, 0,
                            false, pData->data.sData, v8::Local<v8::Object>(),
                            pData->bPersistent == 1);
-        FXJS_PutObjectString(NULL, (v8::Local<v8::Object>)(*m_pJSObject),
+        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((v8::Local<v8::Object>)(*m_pJSObject));
+        v8::Isolate* pRuntime = FXJS_GetRuntime(m_pJSObject->ToV8Object());
         v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(pRuntime, NULL, -1);
 
         PutObjectProperty(pObj, &pData->data);
 
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_OBJECT, 0,
-                           false, "", (v8::Local<v8::Object>)pObj,
-                           pData->bPersistent == 1);
-        FXJS_PutObjectObject(NULL, (v8::Local<v8::Object>)(*m_pJSObject),
-                             pData->data.sKey.UTF8Decode().c_str(),
-                             (v8::Local<v8::Object>)pObj);
+                           false, "", pObj, pData->bPersistent == 1);
+        FXJS_PutObjectObject(NULL, m_pJSObject->ToV8Object(),
+                             pData->data.sKey.UTF8Decode().c_str(), pObj);
+
       } break;
       case JS_GLOBALDATA_TYPE_NULL:
         SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NULL, 0, false,
                            "", v8::Local<v8::Object>(),
                            pData->bPersistent == 1);
-        FXJS_PutObjectNull(NULL, (v8::Local<v8::Object>)(*m_pJSObject),
+        FXJS_PutObjectNull(NULL, m_pJSObject->ToV8Object(),
                            pData->data.sKey.UTF8Decode().c_str());
         break;
     }
@@ -397,33 +395,27 @@
 
     switch (pObjData->nType) {
       case JS_GLOBALDATA_TYPE_NUMBER:
-        FXJS_PutObjectNumber(NULL, (v8::Local<v8::Object>)pObj,
-                             pObjData->sKey.UTF8Decode().c_str(),
+        FXJS_PutObjectNumber(NULL, pObj, pObjData->sKey.UTF8Decode().c_str(),
                              pObjData->dData);
         break;
       case JS_GLOBALDATA_TYPE_BOOLEAN:
-        FXJS_PutObjectBoolean(NULL, (v8::Local<v8::Object>)pObj,
-                              pObjData->sKey.UTF8Decode().c_str(),
-                              (bool)(pObjData->bData == 1));
+        FXJS_PutObjectBoolean(NULL, pObj, pObjData->sKey.UTF8Decode().c_str(),
+                              pObjData->bData == 1);
         break;
       case JS_GLOBALDATA_TYPE_STRING:
-        FXJS_PutObjectString(NULL, (v8::Local<v8::Object>)pObj,
-                             pObjData->sKey.UTF8Decode().c_str(),
+        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((v8::Local<v8::Object>)(*m_pJSObject));
+        v8::Isolate* pRuntime = FXJS_GetRuntime(m_pJSObject->ToV8Object());
         v8::Local<v8::Object> pNewObj =
             FXJS_NewFxDynamicObj(pRuntime, NULL, -1);
         PutObjectProperty(pNewObj, pObjData);
-        FXJS_PutObjectObject(NULL, (v8::Local<v8::Object>)pObj,
-                             pObjData->sKey.UTF8Decode().c_str(),
-                             (v8::Local<v8::Object>)pNewObj);
+        FXJS_PutObjectObject(NULL, pObj, pObjData->sKey.UTF8Decode().c_str(),
+                             pNewObj);
       } break;
       case JS_GLOBALDATA_TYPE_NULL:
-        FXJS_PutObjectNull(NULL, (v8::Local<v8::Object>)pObj,
-                           pObjData->sKey.UTF8Decode().c_str());
+        FXJS_PutObjectNull(NULL, pObj, pObjData->sKey.UTF8Decode().c_str());
         break;
     }
   }