Changeset 178042 in webkit for trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp

Timestamp:

Jan 7, 2015, 11:32:05 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r178039.
​https://bugs.webkit.org/show_bug.cgi?id=140187

Breaks ObjC Inspector Protocol (Requested by JoePeck on
#webkit).

Reverted changeset:

"Web Inspector: purge PassRefPtr from Inspector code and use
Ref for typed and untyped protocol objects"
​https://bugs.webkit.org/show_bug.cgi?id=140053
​http://trac.webkit.org/changeset/178039

File:

• trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp

@@ -99 +99 @@
 
 #if ENABLE(INSPECTOR)
-static RefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSValue value, int maxDepth)
+static PassRefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSValue value, int maxDepth)
 {
     if (!value) {
@@ -124 +124 @@
     if (value.isObject()) {
         if (isJSArray(value)) {
-            Ref<InspectorArray> inspectorArray = InspectorArray::create();
+            RefPtr<InspectorArray> inspectorArray = InspectorArray::create();
             JSArray* array = asArray(value);
             unsigned length = array->length();
@@ -132 +132 @@
                 if (!elementValue)
                     return nullptr;
-                inspectorArray->pushValue(WTF::move(elementValue));
+                inspectorArray->pushValue(elementValue);
             }
-            return WTF::move(inspectorArray);
+            return inspectorArray;
         }
-        Ref<InspectorObject> inspectorObject = InspectorObject::create();
+        RefPtr<InspectorObject> inspectorObject = InspectorObject::create();
         JSObject* object = value.getObject();
         PropertyNameArray propertyNames(scriptState);
@@ -146 +146 @@
             if (!inspectorValue)
                 return nullptr;
-            inspectorObject->setValue(name.string(), WTF::move(inspectorValue));
+            inspectorObject->setValue(name.string(), inspectorValue);
         }
-        return WTF::move(inspectorObject);
+        return inspectorObject;
     }
 
@@ -155 +155 @@
 }
 
-RefPtr<InspectorValue> ScriptValue::toInspectorValue(ExecState* scriptState) const
+PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ExecState* scriptState) const
 {
     JSLockHolder holder(scriptState);