JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / bindings / ScriptValue.cpp

diff --git a/bindings/ScriptValue.cpp b/bindings/ScriptValue.cpp
index 004ff246b4671a60c6ae6baff4858f71c4f73fbb..153b033a11780e01d0fcb34b5f59daf7d1cd7cd8 100644 (file)
--- a/bindings/ScriptValue.cpp
+++ b/bindings/ScriptValue.cpp
@@ -97,8 +97,7 @@ bool ScriptValue::isFunction() const
     return getCallData(m_value.get(), callData) != CallTypeNone;
 }
 
     return getCallData(m_value.get(), callData) != CallTypeNone;
 }
 

-#if ENABLE(INSPECTOR)
-static PassRefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSValue value, int maxDepth)
+static RefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSValue value, int maxDepth)

 {
     if (!value) {
         ASSERT_NOT_REACHED();
 {
     if (!value) {
         ASSERT_NOT_REACHED();


@@ -114,14 +113,16 @@ static PassRefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSV
         return InspectorValue::null();
     if (value.isBoolean())
         return InspectorBasicValue::create(value.asBoolean());
         return InspectorValue::null();
     if (value.isBoolean())
         return InspectorBasicValue::create(value.asBoolean());

-    if (value.isNumber())
+    if (value.isNumber() && value.isDouble())

         return InspectorBasicValue::create(value.asNumber());
         return InspectorBasicValue::create(value.asNumber());

+    if (value.isNumber() && value.isMachineInt())
+        return InspectorBasicValue::create(static_cast<int>(value.asMachineInt()));

     if (value.isString())
         return InspectorString::create(value.getString(scriptState));
 
     if (value.isObject()) {
         if (isJSArray(value)) {
     if (value.isString())
         return InspectorString::create(value.getString(scriptState));
 
     if (value.isObject()) {
         if (isJSArray(value)) {

-            RefPtr<InspectorArray> inspectorArray = InspectorArray::create();
+            Ref<InspectorArray> inspectorArray = InspectorArray::create();

             JSArray* array = asArray(value);
             unsigned length = array->length();
             for (unsigned i = 0; i < length; i++) {
             JSArray* array = asArray(value);
             unsigned length = array->length();
             for (unsigned i = 0; i < length; i++) {


@@ -129,34 +130,33 @@ static PassRefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSV
                 RefPtr<InspectorValue> elementValue = jsToInspectorValue(scriptState, element, maxDepth);
                 if (!elementValue)
                     return nullptr;
                 RefPtr<InspectorValue> elementValue = jsToInspectorValue(scriptState, element, maxDepth);
                 if (!elementValue)
                     return nullptr;

-                inspectorArray->pushValue(elementValue);
+                inspectorArray->pushValue(WTF::move(elementValue));

             }
             }

-            return inspectorArray;
+            return WTF::move(inspectorArray);

         }
         }

-        RefPtr<InspectorObject> inspectorObject = InspectorObject::create();
+        Ref<InspectorObject> inspectorObject = InspectorObject::create();

         JSObject* object = value.getObject();
         PropertyNameArray propertyNames(scriptState);
         JSObject* object = value.getObject();
         PropertyNameArray propertyNames(scriptState);

-        object->methodTable()->getOwnPropertyNames(object, scriptState, propertyNames, ExcludeDontEnumProperties);
+        object->methodTable()->getOwnPropertyNames(object, scriptState, propertyNames, EnumerationMode());

         for (size_t i = 0; i < propertyNames.size(); i++) {
             const Identifier& name = propertyNames[i];
             JSValue propertyValue = object->get(scriptState, name);
             RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, propertyValue, maxDepth);
             if (!inspectorValue)
                 return nullptr;
         for (size_t i = 0; i < propertyNames.size(); i++) {
             const Identifier& name = propertyNames[i];
             JSValue propertyValue = object->get(scriptState, name);
             RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, propertyValue, maxDepth);
             if (!inspectorValue)
                 return nullptr;

-            inspectorObject->setValue(name.string(), inspectorValue);
+            inspectorObject->setValue(name.string(), WTF::move(inspectorValue));

         }
         }

-        return inspectorObject;
+        return WTF::move(inspectorObject);

     }
 
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
     }
 
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 

-PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ExecState* scriptState) const
+RefPtr<InspectorValue> ScriptValue::toInspectorValue(ExecState* scriptState) const

 {
     JSLockHolder holder(scriptState);
     return jsToInspectorValue(scriptState, m_value.get(), InspectorValue::maxDepth);
 }
 {
     JSLockHolder holder(scriptState);
     return jsToInspectorValue(scriptState, m_value.get(), InspectorValue::maxDepth);
 }

-#endif // ENABLE(INSPECTOR)

 
 } // namespace Deprecated
 
 } // namespace Deprecated