Changeset 176078 in webkit

Timestamp:

Nov 13, 2014, 11:07:11 AM (11 years ago)

Author:

mmaxfield@apple.com

Message:

Allow constructing a base PassRef with a derived Ref
​https://bugs.webkit.org/show_bug.cgi?id=138701

Reviewed by Andreas Kling

Source/WTF:

• wtf/PassRef.h:

(WTF::PassRef<T>::PassRef):

Tools:

• TestWebKitAPI/Tests/WTF/Ref.cpp:

(TestWebKitAPI::passWithPassRef):
(TestWebKitAPI::passWithPassRefPtr):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PassRef.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/Ref.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-11-13  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Allow constructing a base PassRef with a derived Ref
+        https://bugs.webkit.org/show_bug.cgi?id=138701
+
+        Reviewed by Andreas Kling
+
+        * wtf/PassRef.h:
+        (WTF::PassRef<T>::PassRef):
+
 2014-11-12  Ryuan Choi  <ryuan.choi@navercorp.com>
 

trunk/Source/WTF/wtf/PassRef.h

@@ -101 +101 @@
 
 template<typename T> template<typename U> inline PassRef<T>::PassRef(const Ref<U>& other)
-    : m_reference(const_cast<T&>(other.get()))
+    : m_reference(static_cast<T&>(const_cast<U&>(other.get())))
 #ifndef NDEBUG
     , m_gaveUpReference(false)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-13  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Allow constructing a base PassRef with a derived Ref
+        https://bugs.webkit.org/show_bug.cgi?id=138701
+
+        Reviewed by Andreas Kling
+
+        * TestWebKitAPI/Tests/WTF/Ref.cpp:
+        (TestWebKitAPI::passWithPassRef):
+        (TestWebKitAPI::passWithPassRefPtr):
+        (TestWebKitAPI::TEST):
+
 2014-11-05  Ada Chan  <adachan@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/Ref.cpp

@@ -99 +99 @@
 }
 
-PassRef<RefLogger> passWithPassRef(PassRef<RefLogger> reference)
+static PassRef<RefLogger> passWithPassRef(PassRef<RefLogger> reference)
 {
     return reference;
 }
 
-RefPtr<RefLogger> passWithPassRefPtr(PassRefPtr<RefLogger> reference)
+static RefPtr<RefLogger> passWithPassRefPtr(PassRefPtr<RefLogger> reference)
 {
     return reference;
@@ -142 +142 @@
     }
     ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+    {
+        RefPtr<DerivedRefLogger> ptr(&a);
+        RefPtr<RefLogger> ptr2(WTF::move(ptr));
+        ASSERT_EQ(nullptr, ptr.get());
+        ASSERT_EQ(&a, ptr2.get());
+    }
+    ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
+
+    {
+        Ref<DerivedRefLogger> derivedReference(a);
+        Ref<RefLogger> baseReference(passWithPassRef(derivedReference));
+        ASSERT_EQ(&a, derivedReference.ptr());
+        ASSERT_EQ(&a, baseReference.ptr());
+    }
+    ASSERT_STREQ("ref(a) ref(a) deref(a) deref(a) ", takeLogStr().c_str());
 }