Changeset 174809 in webkit

Timestamp:

Oct 16, 2014 10:14:25 PM (10 years ago)

Author:

mitz@apple.com

Message:

OSObjectPtr is missing leakRef()
​https://bugs.webkit.org/show_bug.cgi?id=137798

Reviewed by Sam Weinig.

Source/WTF:

• wtf/OSObjectPtr.h:

Tools:

• TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp:

(TestWebKitAPI::TEST(OSObjectPtr, LeakRef)): Added.

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/OSObjectPtr.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-10-16  Dan Bernstein  <mitz@apple.com>
+
+        OSObjectPtr is missing leakRef()
+        https://bugs.webkit.org/show_bug.cgi?id=137798
+
+        Reviewed by Sam Weinig.
+
+        * wtf/OSObjectPtr.h:
+
 2014-10-14  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WTF/wtf/OSObjectPtr.h

@@ -142 +142 @@
     }
 
+    T leakRef() WARN_UNUSED_RETURN
+    {
+        T ptr = m_ptr;
+        m_ptr = nullptr;
+        return ptr;
+    }
+
     friend OSObjectPtr adoptOSObject<T>(T);
 

trunk/Tools/ChangeLog

@@ +1 @@
+2014-10-16  Dan Bernstein  <mitz@apple.com>
+
+        OSObjectPtr is missing leakRef()
+        https://bugs.webkit.org/show_bug.cgi?id=137798
+
+        Reviewed by Sam Weinig.
+
+        * TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp:
+        (TestWebKitAPI::TEST(OSObjectPtr, LeakRef)): Added.
+
 2014-10-16  Lucas Forschler  <lforschler@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/OSObjectPtr.cpp

@@ -52 +52 @@
 }
 
+TEST(OSObjectPtr, LeakRef)
+{
+    OSObjectPtr<dispatch_queue_t> foo = adoptOSObject(dispatch_queue_create(0, DISPATCH_QUEUE_SERIAL));
+    EXPECT_EQ(1, CFGetRetainCount(foo.get()));
+
+    dispatch_queue_t queue = foo.leakRef();
+    EXPECT_EQ(nullptr, foo.get());
+    EXPECT_EQ(1, CFGetRetainCount(queue));
+
+    WTF::releaseOSObject(queue);
+}
+
 } // namespace TestWebKitAPI