Changeset 161253 in webkit

Timestamp:

Jan 2, 2014 11:40:40 PM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Switch from WTF::Function to std::function in WebProcessTest
​https://bugs.webkit.org/show_bug.cgi?id=126397

Reviewed by Anders Carlsson.

Use std::function<> and std::bind() instead of WTF::Function and WTF::bind,
following the effort of using STL concepts where possible.

• UIProcess/API/gtk/tests/WebProcessTest.cpp:

(WebProcessTest::add):

• UIProcess/API/gtk/tests/WebProcessTest.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/WebProcessTest.cpp (modified) (2 diffs)
• UIProcess/API/gtk/tests/WebProcessTest.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-02  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Switch from WTF::Function to std::function in WebProcessTest
+        https://bugs.webkit.org/show_bug.cgi?id=126397
+
+        Reviewed by Anders Carlsson.
+
+        Use std::function<> and std::bind() instead of WTF::Function and WTF::bind,
+        following the effort of using STL concepts where possible.
+
+        * UIProcess/API/gtk/tests/WebProcessTest.cpp:
+        (WebProcessTest::add):
+        * UIProcess/API/gtk/tests/WebProcessTest.h:
+
 2014-01-02  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp

@@ -24 +24 @@
 #include <wtf/gobject/GOwnPtr.h>
 
-typedef HashMap<String, Function<PassOwnPtr<WebProcessTest>()>> TestsMap;
+typedef HashMap<String, std::function<PassOwnPtr<WebProcessTest> ()>> TestsMap;
 static TestsMap& testsMap()
 {
@@ -31 +31 @@
 }
 
-void WebProcessTest::add(const String& testName, Function<PassOwnPtr<WebProcessTest>()> closure)
+void WebProcessTest::add(const String& testName, std::function<PassOwnPtr<WebProcessTest> ()> closure)
 {
-    testsMap().add(testName, closure);
+    testsMap().add(testName, std::forward<std::function<PassOwnPtr<WebProcessTest> ()>>(closure));
 }
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h

@@ -19 +19 @@
 
 #include <webkit2/webkit-web-extension.h>
-#include <wtf/Functional.h>
 #include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
@@ -31 +30 @@
     virtual bool runTest(const char* testName, WebKitWebExtension*, GVariant* args) = 0;
 
-    static void add(const String& testName, Function<PassOwnPtr<WebProcessTest>()>);
+    static void add(const String& testName, std::function<PassOwnPtr<WebProcessTest> ()>);
     static PassOwnPtr<WebProcessTest> create(const String& testName);
 };
 
 #define REGISTER_TEST(ClassName, TestName) \
-    WebProcessTest::add(String::fromUTF8(TestName), WTF::bind(&ClassName::create))
+    WebProcessTest::add(String::fromUTF8(TestName), ClassName::create)