Merge to XFA: Kill overloaded cast operators in CJS_Value.

fpdfsdk/src/javascript/JS_Value.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/JavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
 #include "../../include/javascript/JS_Value.h"
@@ skipping 67 matching lines @@
 
 void CJS_Value::Attach(v8::Handle<v8::Value> pValue,FXJSVALUETYPE t)
 {
         m_pValue = pValue;
         m_eType = t;
 }
 
 void CJS_Value::Attach(CJS_Value *pValue)
 {
         if (pValue)
-                Attach(pValue->ToJSValue(),pValue->GetType());
+                Attach(pValue->ToV8Value(), pValue->GetType());
 }
 
 void CJS_Value::Detach()
 {
         m_pValue = v8::Handle<v8::Value>();
         m_eType = VT_unknown;
 }
 
 /* ---------------------------------------------------------------------------------------- */
 
-CJS_Value::operator int() const
+int CJS_Value::ToInt() const
 {
-
         return JS_ToInt32(m_pValue);
-
 }
 
-CJS_Value::operator bool() const
+bool CJS_Value::ToBool() const
 {
-
         return JS_ToBoolean(m_pValue);
-        
 }
 
-CJS_Value::operator double() const
+double CJS_Value::ToDouble() const
 {
-
         return JS_ToNumber(m_pValue);
-        
 }
 
-CJS_Value::operator float() const
+float CJS_Value::ToFloat() const
 {
-
-        return (float)JS_ToNumber(m_pValue);
-
+        return (float)ToDouble();
 }
 
-CJS_Value::operator CJS_Object *() const
+CJS_Object* CJS_Value::ToCJSObject() const
 {
-
         v8::Handle<v8::Object>  pObj = JS_ToObject(m_pValue);
         return (CJS_Object*)JS_GetPrivate(m_isolate, pObj);
 }
 
-CJS_Value::operator v8::Handle<v8::Object>() const
+v8::Handle<v8::Object> CJS_Value::ToV8Object() const
 {
         return JS_ToObject(m_pValue);
 }
 
-CJS_Value::operator CFX_WideString() const
+CFX_WideString CJS_Value::ToCFXWideString() const
 {
         return JS_ToString(m_pValue);
 }
 
-CJS_Value::operator CFX_ByteString() const
+CFX_ByteString CJS_Value::ToCFXByteString() const
 {
-        return CFX_ByteString::FromUnicode(operator CFX_WideString());
+        return CFX_ByteString::FromUnicode(ToCFXWideString());
 }
 
-v8::Handle<v8::Value> CJS_Value::ToJSValue()
+v8::Handle<v8::Value> CJS_Value::ToV8Value() const
 {
         return m_pValue;
 }
 
-
-CJS_Value::operator v8::Handle<v8::Array>() const
+v8::Handle<v8::Array>CJS_Value::ToV8Array() const
 {
         if (IsArrayObject())
                 return v8::Handle<v8::Array>::Cast(JS_ToObject(m_pValue));
         return v8::Handle<v8::Array>();
 }
 
 /* ---------------------------------------------------------------------------------------- */
 
 void CJS_Value::operator =(int iValue)
 {
@@ skipping 72 matching lines @@
 
 void CJS_Value::operator = (CJS_Date & date)
 {
         m_pValue = JS_NewDate(m_isolate, (double)date);
 
         m_eType = VT_date;
 }
 
 void CJS_Value::operator = (CJS_Value value)
 {
-        m_pValue = value.ToJSValue();
+        m_pValue = value.ToV8Value();
 
         m_eType = value.m_eType;
 }
 
 /* ---------------------------------------------------------------------------------------- */
 
 FXJSVALUETYPE CJS_Value::GetType() const
 {
         if(m_pValue.IsEmpty()) return VT_unknown;
         if(m_pValue->IsString()) return VT_string;
@@ skipping 76 matching lines @@
 
 void CJS_PropValue::operator <<(int iValue)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator =(iValue);
 }
 
 void CJS_PropValue::operator >>(int & iValue) const
 {
         ASSERT(m_bIsSetting);
-        iValue = CJS_Value::operator int();
+        iValue = CJS_Value::ToInt();
 }
 
 
 void CJS_PropValue::operator <<(bool bValue)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator =(bValue);
 }
 
 void CJS_PropValue::operator >>(bool& bValue) const
 {
         ASSERT(m_bIsSetting);
-        bValue = CJS_Value::operator bool();
-
+        bValue = CJS_Value::ToBool();
 }
 
 void CJS_PropValue::operator <<(double dValue)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator =(dValue);
 }
 
 void CJS_PropValue::operator >>(double& dValue) const
 {
         ASSERT(m_bIsSetting);
-        dValue = CJS_Value::operator double();
+        dValue = CJS_Value::ToDouble();
 }
 
 void CJS_PropValue::operator <<(CJS_Object* pObj)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator = (pObj);
 }
 
 void CJS_PropValue::operator >>(CJS_Object*& ppObj) const
 {
         ASSERT(m_bIsSetting);
-        ppObj = CJS_Value::operator CJS_Object *();
+        ppObj = CJS_Value::ToCJSObject();
 }
 
 void CJS_PropValue::operator <<(CJS_Document* pJsDoc)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator = (pJsDoc);
 }
 
 void CJS_PropValue::operator >>(CJS_Document*& ppJsDoc) const
 {
         ASSERT(m_bIsSetting);
-        ppJsDoc = static_cast<CJS_Document*>(CJS_Value::operator CJS_Object *());
+        ppJsDoc = static_cast<CJS_Document*>(CJS_Value::ToCJSObject());
 }
 
 void CJS_PropValue::operator<<(JSFXObject pObj)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator = (pObj);
 }
 
 void CJS_PropValue::operator>>(JSFXObject &ppObj) const
 {
         ASSERT(m_bIsSetting);
-        ppObj = CJS_Value::operator JSFXObject ();
+        ppObj = CJS_Value::ToV8Object();
 }
 
 
 void CJS_PropValue::StartSetting()
 {
         m_bIsSetting = 1;
 }
 
 void CJS_PropValue::StartGetting()
 {
         m_bIsSetting = 0;
 }
 void CJS_PropValue::operator <<(CFX_ByteString string)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator = (string.c_str());
 }
 
 void CJS_PropValue::operator >>(CFX_ByteString &string) const
 {
         ASSERT(m_bIsSetting);
-        string = CJS_Value::operator CFX_ByteString();
+        string = CJS_Value::ToCFXByteString();
 }
 
 void CJS_PropValue::operator <<(FX_LPCWSTR c_string)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator =(c_string);
 }
 
 void CJS_PropValue::operator >>(CFX_WideString &wide_string) const
 {
         ASSERT(m_bIsSetting);
-        wide_string = CJS_Value::operator CFX_WideString();
+        wide_string = CJS_Value::ToCFXWideString();
 }
 
 void CJS_PropValue::operator <<(CFX_WideString wide_string)
 {
         ASSERT(!m_bIsSetting);
         CJS_Value::operator = (wide_string);
 }
 
 void CJS_PropValue::operator >>(CJS_Array &array) const
 {
@@ skipping 49 matching lines @@
                 return;
         v8::Handle<v8::Value>  p = JS_GetArrayElemnet(m_pArray,index);
         value.Attach(p,VT_object);
 }
 
 void CJS_Array::SetElement(unsigned index,CJS_Value value)
 {
         if (m_pArray.IsEmpty())
                 m_pArray = JS_NewArray(m_isolate);
 
-        JS_PutArrayElement(m_pArray,index,value.ToJSValue(),value.GetType());
+        JS_PutArrayElement(m_pArray, index, value.ToV8Value(), value.GetType());
 }
 
 int CJS_Array::GetLength()
 {
         if (m_pArray.IsEmpty())
                 return 0;
         return JS_GetArrayLength(m_pArray);
 }
 
 CJS_Array:: operator v8::Handle<v8::Array>()
@@ skipping 141 matching lines @@
                 return 0.0;
         return JS_ToNumber(m_pDate);
 }
 
 CFX_WideString CJS_Date::ToString() const
 {
         if(m_pDate.IsEmpty())
                 return L"";
         return JS_ToString(m_pDate);
 }