Changeset 205325 in webkit

Timestamp:

Sep 1, 2016 3:45:52 PM (8 years ago)

Author:

andersca@apple.com

Message:

Use BlockPtr::fromCallable in WorkQueue::dispatch and WorkQueue::dispatchAfter
​https://bugs.webkit.org/show_bug.cgi?id=161512

Reviewed by Chris Dumez.

This lets us get rid of leakCallable and adoptCallable.

• wtf/BlockPtr.h:
• wtf/Function.h:
• wtf/cocoa/WorkQueueCocoa.cpp:

(WTF::WorkQueue::dispatch):
(WTF::WorkQueue::dispatchAfter):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/BlockPtr.h (modified) (1 diff)
• wtf/Function.h (modified) (2 diffs)
• wtf/cocoa/WorkQueueCocoa.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-09-01  Anders Carlsson  <andersca@apple.com>
+
+        Use BlockPtr::fromCallable in WorkQueue::dispatch and WorkQueue::dispatchAfter
+        https://bugs.webkit.org/show_bug.cgi?id=161512
+
+        Reviewed by Chris Dumez.
+
+        This lets us get rid of leakCallable and adoptCallable.
+
+        * wtf/BlockPtr.h:
+        * wtf/Function.h:
+        * wtf/cocoa/WorkQueueCocoa.cpp:
+        (WTF::WorkQueue::dispatch):
+        (WTF::WorkQueue::dispatchAfter):
+
 2016-09-01  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/BlockPtr.h

@@ -91 +91 @@
 
         BlockPtr blockPtr;
-        blockPtr.m_block = static_cast<BlockType>(block);
+        blockPtr.m_block = reinterpret_cast<BlockType>(block);
 
         return blockPtr;

trunk/Source/WTF/wtf/Function.h

@@ -67 +67 @@
     }
 
+private:
     class CallableWrapperBase {
         WTF_MAKE_FAST_ALLOCATED;
@@ -75 +76 @@
     };
 
-    CallableWrapperBase* leakCallable() WARN_UNUSED_RETURN
-    {
-        return m_callableWrapper.release();
-    }
-
-    static Function adoptCallable(CallableWrapperBase* callable)
-    {
-        Function function;
-        function.m_callableWrapper.reset(callable);
-        return function;
-    }
-
-private:
     template<typename CallableType>
     class CallableWrapper : public CallableWrapperBase {

trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "WorkQueue.h"
+#include "BlockPtr.h"
+#include "Ref.h"
 
 namespace WTF {
@@ -31 +33 @@
 void WorkQueue::dispatch(Function<void ()>&& function)
 {
-    ref();
-    auto* callable = function.leakCallable();
-    dispatch_async(m_dispatchQueue, ^{
-        auto function = Function<void ()>::adoptCallable(callable);
+    dispatch_async(m_dispatchQueue, BlockPtr<void ()>::fromCallable([protectedThis = makeRef(*this), function = WTFMove(function)] {
         function();
-        deref();
-    });
+    }).get());
 }
 
 void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, Function<void ()>&& function)
 {
-    ref();
-    auto* callable = function.leakCallable();
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration.count()), m_dispatchQueue, ^{
-        auto function = Function<void ()>::adoptCallable(callable);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration.count()), m_dispatchQueue, BlockPtr<void ()>::fromCallable([protectedThis = makeRef(*this), function = WTFMove(function)] {
         function();
-        deref();
-    });
+    }).get());
 }