Merge to XFA: Kill overloaded cast operators in CJS_Value.

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 157 matching lines @@
                 case VT_number:
                         {
                                 double dData;
                                 vp >> dData;
                                 return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Handle<v8::Object>(), FALSE);
                         }
                 case VT_boolean:
                         {
                                 bool bData;
                                 vp >> bData;
-                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, (bool)vp, "", v8::Handle<v8::Object>(), FALSE);
+                                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Handle<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);
                         }
                 case VT_object:
                         {
-                                JSObject pData = (JSObject)vp;
+                                JSObject pData;
+                                vp >> pData;
                                 return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", pData, FALSE);
-//                              else
-//                              {
-//                                      if (vp.IsArrayObject())
-//                                      {
-//                                              CJS_Array array;
-//                                              vp.ConvertToArray(array);
-//                                              return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", 
-//                                                      (Dobject*)(Darray*)array, FALSE);
-//                                      }
-//                                      else
-//                                              return FALSE;
-//                              }
                         }
                 case VT_null:
                         {
                                 return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Handle<v8::Object>(), FALSE);
                         }
                 case VT_undefined:
                         {
                                 DelProperty(cc, propname, sError);
                                 return TRUE;
                         }
@@ skipping 60 matching lines @@
 
 FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (params.size() != 2)
         {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
                 return FALSE;
         }
 
-        CFX_ByteString sName = params[0];
+        CFX_ByteString sName = params[0].ToCFXByteString();
 
         js_global_data* pData = NULL;
         if (m_mapGlobal.Lookup(sName, (FX_LPVOID&)pData))
         {
                 if (pData && !pData->bDeleted)
                 {
-                        pData->bPersistent = (bool)params[1];
+                        pData->bPersistent = params[1].ToBool();
                         return TRUE;
                 }
         }
 
         sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
         return FALSE;
 }
 
 void global_alternate::UpdateGlobalPersistentVariables()
 {
@@ skipping 128 matching lines @@
                         {
                                 CJS_KeyValue* pObjElement = new CJS_KeyValue;
                                 pObjElement->nType = JS_GLOBALDATA_TYPE_BOOLEAN;
                                 pObjElement->sKey = sKey;
                                 pObjElement->dData = JS_ToBoolean(v);
                                 array.Add(pObjElement);
                         }
                         break;
                 case VT_string:
                         {
-                                CFX_ByteString sValue = CJS_Value(isolate, v, 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;
@@ skipping 187 matching lines @@
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }