Changeset 157374 in webkit

Timestamp:

Oct 13, 2013 9:12:49 AM (11 years ago)

Author:

andersca@apple.com

Message:

Change callOnMainThread to take an std::function
​https://bugs.webkit.org/show_bug.cgi?id=122698

Reviewed by Darin Adler.

This will let us pass anything that can be converted to an std::function (including lambdas and
WTF::Function objects) to callOnMainThread.

• wtf/MainThread.cpp:

(WTF::callOnMainThread):

• wtf/MainThread.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MainThread.cpp (modified) (1 diff)
• wtf/MainThread.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-10-12  Anders Carlsson  <andersca@apple.com>
+
+        Change callOnMainThread to take an std::function
+        https://bugs.webkit.org/show_bug.cgi?id=122698
+
+        Reviewed by Darin Adler.
+
+        This will let us pass anything that can be converted to an std::function (including lambdas and
+        WTF::Function objects) to callOnMainThread.
+
+        * wtf/MainThread.cpp:
+        (WTF::callOnMainThread):
+        * wtf/MainThread.h:
+
 2013-09-06  Jessica Pease  <jessica_n_pease@apple.com>
 

trunk/Source/WTF/wtf/MainThread.cpp

@@ -233 +233 @@
 static void callFunctionObject(void* context)
 {
-    Function<void ()>* function = static_cast<Function<void ()>*>(context);
+    auto function = std::unique_ptr<std::function<void ()>>(static_cast<std::function<void ()>*>(context));
     (*function)();
-    delete function;
-}
-
-void callOnMainThread(const Function<void ()>& function)
-{
-    callOnMainThread(callFunctionObject, new Function<void ()>(function));
+}
+
+void callOnMainThread(std::function<void ()> function)
+{
+    callOnMainThread(callFunctionObject, std::make_unique<std::function<void ()>>(std::move(function)).release());
 }
 

trunk/Source/WTF/wtf/MainThread.h

@@ -31 +31 @@
 #define MainThread_h
 
+#include <functional>
 #include <stdint.h>
 
@@ -45 +46 @@
 WTF_EXPORT_PRIVATE void cancelCallOnMainThread(MainThreadFunction*, void* context);
 
-template<typename> class Function;
-WTF_EXPORT_PRIVATE void callOnMainThread(const Function<void ()>&);
-    
+WTF_EXPORT_PRIVATE void callOnMainThread(std::function<void ()>);
+
 WTF_EXPORT_PRIVATE void setMainThreadCallbacksPaused(bool paused);