Changeset 178042 in webkit for trunk/Source/JavaScriptCore/replay

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

Location:

trunk/Source/JavaScriptCore/replay

Files:

• EncodedValue.cpp (modified) (6 diffs)
• EncodedValue.h (modified) (2 diffs)
• scripts/CodeGeneratorReplayInputs.py (modified) (3 diffs)

trunk/Source/JavaScriptCore/replay/EncodedValue.cpp

@@ -38 +38 @@
 namespace JSC {
 
-RefPtr<InspectorObject> EncodedValue::asObject()
+PassRefPtr<InspectorObject> EncodedValue::asObject()
 {
     RefPtr<InspectorObject> result;
@@ -44 +44 @@
     ASSERT_UNUSED(castSucceeded, castSucceeded);
 
-    return result;
-}
-
-RefPtr<InspectorArray> EncodedValue::asArray()
+    return result.release();
+}
+
+PassRefPtr<InspectorArray> EncodedValue::asArray()
 {
     RefPtr<InspectorArray> result;
@@ -53 +53 @@
     ASSERT_UNUSED(castSucceeded, castSucceeded);
 
-    return result;
+    return result.release();
 }
 
@@ -176 +176 @@
 void EncodedValue::put<EncodedValue>(const String& key, const typename EncodingTraits<EncodedValue>::DecodedType& value)
 {
-    asObject()->setValue(key, value.m_value.copyRef());
+    asObject()->setValue(key, value.m_value);
 }
 
@@ -182 +182 @@
 void EncodedValue::append<EncodedValue>(const typename EncodingTraits<EncodedValue>::DecodedType& value)
 {
-    asArray()->pushValue(value.m_value.copyRef());
+    asArray()->pushValue(value.m_value);
 }
 
@@ -188 +188 @@
 bool EncodedValue::get<EncodedValue>(const String& key, typename EncodingTraits<EncodedValue>::DecodedType& decodedValue)
 {
-    RefPtr<Inspector::InspectorValue> value;
-    if (!asObject()->getValue(key, value))
+    RefPtr<Inspector::InspectorValue> inspectorValue(asObject()->get(key));
+    if (!inspectorValue)
         return false;
 
-    decodedValue = EncodedValue(WTF::move(value));
+    decodedValue = EncodedValue(inspectorValue);
     return true;
 }

trunk/Source/JavaScriptCore/replay/EncodedValue.h

@@ -42 +42 @@
 class EncodedValue final {
 public:
-    explicit EncodedValue(RefPtr<Inspector::InspectorValue>&& value)
+    explicit EncodedValue(PassRefPtr<Inspector::InspectorValue> value)
         : m_value(value) { }
 
@@ -79 +79 @@
     template<typename T> T convertTo();
 
-    JS_EXPORT_PRIVATE RefPtr<Inspector::InspectorObject> asObject();
-    JS_EXPORT_PRIVATE RefPtr<Inspector::InspectorArray> asArray();
+    JS_EXPORT_PRIVATE PassRefPtr<Inspector::InspectorObject> asObject();
+    JS_EXPORT_PRIVATE PassRefPtr<Inspector::InspectorArray> asArray();
 
 private:

trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py

@@ -342 +342 @@
             return self.type_name(qualified)
         elif self.mode == TypeModes.SHARED:
-            return "RefPtr<%s>" % self.type_name(qualified)
+            return "PassRefPtr<%s>" % self.type_name(qualified)
         else:
             return "const %s&" % self.type_name(qualified)
@@ -348 +348 @@
     def argument_type(self, qualified=False):
         if self.mode == TypeModes.SHARED:
-            return "RefPtr<%s>&&" % self.type_name(qualified)
+            return "PassRefPtr<%s>" % self.type_name(qualified)
         else:
             return self.storage_type()
@@ -940 +940 @@
     def generate_member_move_expression(self, _member):
         _type = self._model.get_type_for_member(_member)
-        if _type.mode in [TypeModes.OWNED, TypeModes.SHARED]:
+        if _type.mode == TypeModes.OWNED:
             return "WTF::move(%s)" % _member.memberName
         else: