Changeset 162370 in webkit

Timestamp:

Jan 20, 2014 1:17:24 PM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][WK2] Move the rest of GTK's WorkQueue implementation to std::function
​https://bugs.webkit.org/show_bug.cgi?id=127273

Reviewed by Anders Carlsson.

Move to using std::function and move semantics in WorkQueue::registerSocketEventHandler
and WorkQueue::SocketEventSource.

• Platform/IPC/unix/ConnectionUnix.cpp:

(IPC::Connection::open):

• Platform/WorkQueue.h:
• Platform/gtk/WorkQueueGtk.cpp:

(WorkQueue::SocketEventSource::SocketEventSource):
(WorkQueue::registerSocketEventHandler):
(WorkQueue::dispatchOnSource): Use std::move instead of std::forward<T>.
(WorkQueue::dispatch): Ditto.
(WorkQueue::dispatchAfter): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/unix/ConnectionUnix.cpp (modified) (1 diff)
• Platform/WorkQueue.h (modified) (1 diff)
• Platform/gtk/WorkQueueGtk.cpp (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-20  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WK2] Move the rest of GTK's WorkQueue implementation to std::function
+        https://bugs.webkit.org/show_bug.cgi?id=127273
+
+        Reviewed by Anders Carlsson.
+
+        Move to using std::function and move semantics in WorkQueue::registerSocketEventHandler
+        and WorkQueue::SocketEventSource.
+
+        * Platform/IPC/unix/ConnectionUnix.cpp:
+        (IPC::Connection::open):
+        * Platform/WorkQueue.h:
+        * Platform/gtk/WorkQueueGtk.cpp:
+        (WorkQueue::SocketEventSource::SocketEventSource):
+        (WorkQueue::registerSocketEventHandler):
+        (WorkQueue::dispatchOnSource): Use std::move instead of std::forward<T>.
+        (WorkQueue::dispatch): Ditto.
+        (WorkQueue::dispatchAfter): Ditto.
+
 2014-01-20  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp

@@ -389 +389 @@
     m_isConnected = true;
 #if PLATFORM(GTK)
-    m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, WTF::bind(&Connection::readyReadHandler, this), WTF::bind(&Connection::connectionDidClose, this));
+    RefPtr<Connection> protector(this);
+    m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
+        [=] {
+            protector->readyReadHandler();
+        },
+        [=] {
+            protector->connectionDidClose();
+        });
 #elif PLATFORM(EFL)
     m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, WTF::bind(&Connection::readyReadHandler, this));

trunk/Source/WebKit2/Platform/WorkQueue.h

@@ -64 +64 @@
     dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
 #elif PLATFORM(GTK)
-    void registerSocketEventHandler(int, const Function<void()>&, const Function<void()>&);
+    void registerSocketEventHandler(int, std::function<void ()>, std::function<void ()>);
     void unregisterSocketEventHandler(int);
 #elif PLATFORM(EFL)

trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp

@@ -70 +70 @@
 class WorkQueue::SocketEventSource : public WorkQueue::EventSource {
 public:
-    SocketEventSource(const Function<void()>& function, WorkQueue* workQueue, GCancellable* cancellable, const Function<void()>& closeFunction)
-        : EventSource(function, workQueue)
+    SocketEventSource(std::function<void ()> function, WorkQueue* workQueue, GCancellable* cancellable, std::function<void ()> closeFunction)
+        : EventSource(std::move(function), workQueue)
         , m_cancellable(cancellable)
-        , m_closeFunction(closeFunction)
+        , m_closeFunction(std::move(closeFunction))
     {
         ASSERT(cancellable);
@@ -108 +108 @@
 private:
     GCancellable* m_cancellable;
-    Function<void()> m_closeFunction;
+    std::function<void ()> m_closeFunction;
 };
 
@@ -160 +160 @@
 }
 
-void WorkQueue::registerSocketEventHandler(int fileDescriptor, const Function<void()>& function, const Function<void()>& closeFunction)
+void WorkQueue::registerSocketEventHandler(int fileDescriptor, std::function<void ()> function, std::function<void ()> closeFunction)
 {
     GRefPtr<GSocket> socket = adoptGRef(g_socket_new_from_fd(fileDescriptor, 0));
@@ -167 +167 @@
     GRefPtr<GSource> dispatchSource = adoptGRef(g_socket_create_source(socket.get(), G_IO_IN, cancellable.get()));
     ASSERT(dispatchSource);
-    SocketEventSource* eventSource = new SocketEventSource(function, this, cancellable.get(), closeFunction);
+    SocketEventSource* eventSource = new SocketEventSource(std::move(function), this,
+        cancellable.get(), std::move(closeFunction));
 
     g_source_set_callback(dispatchSource.get(), reinterpret_cast<GSourceFunc>(&WorkQueue::SocketEventSource::eventCallback),
@@ -207 +208 @@
 void WorkQueue::dispatchOnSource(GSource* dispatchSource, std::function<void ()> function, GSourceFunc sourceCallback)
 {
-    g_source_set_callback(dispatchSource, sourceCallback, new EventSource(std::forward<std::function<void ()>>(function), this),
+    g_source_set_callback(dispatchSource, sourceCallback, new EventSource(std::move(function), this),
         reinterpret_cast<GDestroyNotify>(&WorkQueue::EventSource::deleteEventSource));
 
@@ -217 +218 @@
     GRefPtr<GSource> dispatchSource = adoptGRef(g_idle_source_new());
     g_source_set_priority(dispatchSource.get(), G_PRIORITY_DEFAULT);
-    dispatchOnSource(dispatchSource.get(), std::forward<std::function<void ()>>(function),
+    dispatchOnSource(dispatchSource.get(), std::move(function),
         reinterpret_cast<GSourceFunc>(&WorkQueue::EventSource::performWorkOnce));
 }
@@ -225 +226 @@
     GRefPtr<GSource> dispatchSource = adoptGRef(g_timeout_source_new(
         static_cast<guint>(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count())));
-    dispatchOnSource(dispatchSource.get(), std::forward<std::function<void ()>>(function),
+    dispatchOnSource(dispatchSource.get(), std::move(function),
         reinterpret_cast<GSourceFunc>(&WorkQueue::EventSource::performWorkOnce));
 }