Merge V8 API updates to xfa branch

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 "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_EventHandler.h"
@@ skipping 151 matching lines @@
 {
         if (vp.IsSetting())
         {
                 CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
                 switch (vp.GetType())
                 {
                 case VT_number:
                         {
                                 double dData;
                                 vp >> dData;
-                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Handle<v8::Object>(), FALSE);
+                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Local<v8::Object>(), FALSE);
                         }
                 case VT_boolean:
                         {
                                 bool bData;
                                 vp >> bData;
-                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Handle<v8::Object>(), FALSE);
+                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Local<v8::Object>(), FALSE);
                         }
                 case VT_string:
                         {
                                 CFX_ByteString sData;
                                 vp >> sData;
-                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_STRING, 0, false, sData, v8::Handle<v8::Object>(), FALSE);
+                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_STRING, 0, false, sData, v8::Local<v8::Object>(), FALSE);
                         }
                 case VT_object:
                         {
                                 JSObject pData;
                                 vp >> pData;
                                 return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", pData, FALSE);
                         }
                 case VT_null:
                         {
-                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Handle<v8::Object>(), FALSE);
+                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Local<v8::Object>(), FALSE);
                         }
                 case VT_undefined:
                         {
                                 DelProperty(cc, propname, sError);
                                 return TRUE;
                         }
                 default:
                         return FALSE;
                 }
         }
@@ skipping 14 matching lines @@
                                                 vp << pData->dData;
                                                 break;
                                         case JS_GLOBALDATA_TYPE_BOOLEAN:
                                                 vp << pData->bData;
                                                 break;
                                         case JS_GLOBALDATA_TYPE_STRING:
                                                 vp << pData->sData;
                                                 break;
                                         case JS_GLOBALDATA_TYPE_OBJECT:
                                                 {
-                                                        v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(vp.GetIsolate(),pData->pData);
+                                                        v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(vp.GetIsolate(),pData->pData);
                                                         vp << obj;
                                                         break;
                                                 }
                                         case JS_GLOBALDATA_TYPE_NULL:
                                                 vp.SetNull();
                                                 break;
                                         default:
                                                 return FALSE;
                                         }
                                         return TRUE;
@@ skipping 49 matching lines @@
         ASSERT(m_pGlobalData != NULL);
 
         for (int i=0,sz=m_pGlobalData->GetSize(); i<sz; i++)
         {
                 CJS_GlobalData_Element* pData = m_pGlobalData->GetAt(i);
                 ASSERT(pData != NULL);
 
                 switch (pData->data.nType)
                 {
                 case JS_GLOBALDATA_TYPE_NUMBER:
-                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NUMBER, pData->data.dData, false, "", v8::Handle<v8::Object>(), pData->bPersistent == 1);
+                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NUMBER, pData->data.dData, false, "", v8::Local<v8::Object>(), pData->bPersistent == 1);
                         JS_PutObjectNumber(NULL,(JSFXObject)(*m_pJSObject),
                                                            pData->data.sKey.UTF8Decode().c_str(), pData->data.dData);
                         break;
                 case JS_GLOBALDATA_TYPE_BOOLEAN:
-                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_BOOLEAN, 0, (bool)(pData->data.bData == 1), "", v8::Handle<v8::Object>(), pData->bPersistent == 1);
+                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_BOOLEAN, 0, (bool)(pData->data.bData == 1), "", v8::Local<v8::Object>(), pData->bPersistent == 1);
                         JS_PutObjectBoolean(NULL,(JSFXObject)(*m_pJSObject),
                                                                 pData->data.sKey.UTF8Decode().c_str(), (bool)(pData->data.bData == 1));
                         break;
                 case JS_GLOBALDATA_TYPE_STRING:
-                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_STRING, 0, false, pData->data.sData, v8::Handle<v8::Object>(), pData->bPersistent == 1);
+                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_STRING, 0, false, pData->data.sData, v8::Local<v8::Object>(), pData->bPersistent == 1);
                         JS_PutObjectString(NULL, (JSFXObject)(*m_pJSObject),
                                                            pData->data.sKey.UTF8Decode().c_str(),
                                                            pData->data.sData.UTF8Decode().c_str());
                         break;
                 case JS_GLOBALDATA_TYPE_OBJECT:
                         {
                                 IJS_Runtime* pRuntime = JS_GetRuntime((JSFXObject)(*m_pJSObject));
-                                v8::Handle<v8::Object> pObj = JS_NewFxDynamicObj(pRuntime, NULL, -1);
+                                v8::Local<v8::Object> pObj = JS_NewFxDynamicObj(pRuntime, NULL, -1);
 
                                 PutObjectProperty(pObj, &pData->data);
 
                                 this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", 
                                         (JSObject)pObj, pData->bPersistent == 1);
                                 JS_PutObjectObject(NULL,(JSFXObject)(*m_pJSObject),
                                                                    pData->data.sKey.UTF8Decode().c_str(), (JSObject)pObj);
                         }
                         break;
                 case JS_GLOBALDATA_TYPE_NULL:
-                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Handle<v8::Object>(), pData->bPersistent == 1);
+                        this->SetGlobalVariables(pData->data.sKey, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Local<v8::Object>(), pData->bPersistent == 1);
                         JS_PutObjectNull(NULL,(JSFXObject)(*m_pJSObject),
                                                          pData->data.sKey.UTF8Decode().c_str());
                         break;
                 }
         }
 }
 
 void global_alternate::CommitGlobalPersisitentVariables()
 {
         ASSERT(m_pGlobalData != NULL);
@@ skipping 24 matching lines @@
                                         m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
                                         break;
                                 case JS_GLOBALDATA_TYPE_STRING:
                                         m_pGlobalData->SetGlobalVariableString(name, pData->sData);
                                         m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
                                         break;
                                 case JS_GLOBALDATA_TYPE_OBJECT:
                                         //if (pData->pData)
                                         {
                                                 CJS_GlobalVariableArray array;
-                                                v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(GetJSObject()->GetIsolate(),pData->pData);
+                                                v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(GetJSObject()->GetIsolate(),pData->pData);
                                                 ObjectToArray(obj, array);
                                                 m_pGlobalData->SetGlobalVariableObject(name, array);
                                                 m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
                                         }
                                         break;
                                 case JS_GLOBALDATA_TYPE_NULL:
                                         m_pGlobalData->SetGlobalVariableNull(name);
                                         m_pGlobalData->SetGlobalVariablePersistent(name, pData->bPersistent);
                                         break;
                                 }
                         }
                 }
         }
 }
 
-void global_alternate::ObjectToArray(v8::Handle<v8::Object> pObj, CJS_GlobalVariableArray& array)
+void global_alternate::ObjectToArray(v8::Local<v8::Object> pObj, CJS_GlobalVariableArray& array)
 {
-        v8::Handle<v8::Array> pKeyList = JS_GetObjectElementNames(pObj);
-        int     nObjElements = pKeyList->Length();
-
         v8::Local<v8::Context> context = pObj->CreationContext();
         v8::Isolate* isolate = context->GetIsolate();
+        v8::Local<v8::Array> pKeyList = JS_GetObjectElementNames(isolate, pObj);
+        int     nObjElements = pKeyList->Length();
 
         for (int i=0; i<nObjElements; i++)
         {
                 
-                CFX_WideString ws = JS_ToString(JS_GetArrayElemnet(pKeyList, i));
+                CFX_WideString ws = JS_ToString(isolate, JS_GetArrayElement(isolate, pKeyList, i));
                 CFX_ByteString sKey = ws.UTF8Encode();
 
-                v8::Handle<v8::Value> v = JS_GetObjectElement(isolate, pObj, ws.c_str());
+                v8::Local<v8::Value> v = JS_GetObjectElement(isolate, pObj, ws.c_str());
                 FXJSVALUETYPE vt = GET_VALUE_TYPE(v);
                 switch (vt)
                 {
                 case VT_number:
                         {
                                 CJS_KeyValue* pObjElement = new CJS_KeyValue;
                                 pObjElement->nType = JS_GLOBALDATA_TYPE_NUMBER;
                                 pObjElement->sKey = sKey;
-                                pObjElement->dData = JS_ToNumber(v);
+                                pObjElement->dData = JS_ToNumber(isolate, v);
                                 array.Add(pObjElement);
                         }
                         break;
                 case VT_boolean:
                         {
                                 CJS_KeyValue* pObjElement = new CJS_KeyValue;
                                 pObjElement->nType = JS_GLOBALDATA_TYPE_BOOLEAN;
                                 pObjElement->sKey = sKey;
-                                pObjElement->dData = JS_ToBoolean(v);
+                                pObjElement->dData = JS_ToBoolean(isolate, v);
                                 array.Add(pObjElement);
                         }
                         break;
                 case VT_string:
                         {
                                 CFX_ByteString sValue = CJS_Value(isolate, v, VT_string).ToCFXByteString();
                                 CJS_KeyValue* pObjElement = new CJS_KeyValue;
                                 pObjElement->nType = JS_GLOBALDATA_TYPE_STRING;
                                 pObjElement->sKey = sKey;
                                 pObjElement->sData = sValue;
                                 array.Add(pObjElement);
                         }
                         break;
                 case VT_object:
                         {
                                 CJS_KeyValue* pObjElement = new CJS_KeyValue;
                                 pObjElement->nType = JS_GLOBALDATA_TYPE_OBJECT;
                                 pObjElement->sKey = sKey;
-                                ObjectToArray(JS_ToObject(v), pObjElement->objData);
+                                ObjectToArray(JS_ToObject(isolate, v), pObjElement->objData);
                                 array.Add(pObjElement);
                         }
                         break;
                 case VT_null:
                         {
                                 CJS_KeyValue* pObjElement = new CJS_KeyValue;
                                 pObjElement->nType = JS_GLOBALDATA_TYPE_NULL;
                                 pObjElement->sKey = sKey;
                                 array.Add(pObjElement);
                         }
                         break;
                 default:
                         break;
                 }
         }
 }
 
-void global_alternate::PutObjectProperty(v8::Handle<v8::Object> pObj, CJS_KeyValue* pData)
+void global_alternate::PutObjectProperty(v8::Local<v8::Object> pObj, CJS_KeyValue* pData)
 {
         ASSERT(pData != NULL);
 
         for (int i=0,sz=pData->objData.Count(); i<sz; i++)
         {
                 CJS_KeyValue* pObjData = pData->objData.GetAt(i);
                 ASSERT(pObjData != NULL);
 
                 switch (pObjData->nType)
                 {
                 case JS_GLOBALDATA_TYPE_NUMBER:
                         JS_PutObjectNumber(NULL,(JSObject)pObj, pObjData->sKey.UTF8Decode().c_str(), pObjData->dData);
                         break;
                 case JS_GLOBALDATA_TYPE_BOOLEAN:
                         JS_PutObjectBoolean(NULL,(JSObject)pObj, pObjData->sKey.UTF8Decode().c_str(), (bool)(pObjData->bData == 1));
                         break;
                 case JS_GLOBALDATA_TYPE_STRING:
                         JS_PutObjectString(NULL,(JSObject)pObj, pObjData->sKey.UTF8Decode().c_str(), pObjData->sData.UTF8Decode().c_str());
                         break;
                 case JS_GLOBALDATA_TYPE_OBJECT:
                         {
                                 IJS_Runtime* pRuntime = JS_GetRuntime((JSFXObject)(*m_pJSObject));
-                                v8::Handle<v8::Object> pNewObj = JS_NewFxDynamicObj(pRuntime, NULL, -1);
+                                v8::Local<v8::Object> pNewObj = JS_NewFxDynamicObj(pRuntime, NULL, -1);
                                 PutObjectProperty(pNewObj, pObjData);
                                 JS_PutObjectObject(NULL, (JSObject)pObj, pObjData->sKey.UTF8Decode().c_str(), (JSObject)pNewObj);
                         }
                         break;
                 case JS_GLOBALDATA_TYPE_NULL:
                         JS_PutObjectNull(NULL,(JSObject)pObj, pObjData->sKey.UTF8Decode().c_str());
                         break;
                 }
         }
 }
@@ skipping 109 matching lines @@
                 break;
         default:
                 return FALSE;
         }       
 
         m_mapGlobal.SetAt(propname, (FX_LPVOID)pNewData);
 
         return TRUE;
 }
 
-FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle<v8::Value> p)
+FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p)
 {
   const unsigned int nHash = JS_CalcHash(JS_GetTypeof(p));
 
   if (nHash == JSCONST_nUndefHash)
     return VT_undefined;
   if (nHash == JSCONST_nNullHash)
     return VT_null;
   if (nHash == JSCONST_nStringHash)
     return VT_string;
   if (nHash == JSCONST_nNumberHash)
     return VT_number;
   if (nHash == JSCONST_nBoolHash)
     return VT_boolean;
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }