Changeset 141580 in webkit

Timestamp:

Feb 1, 2013 4:54:33 AM (11 years ago)

Author:

Simon Hausmann

Message:

[Gtk][WK2] Fix build after recent WebKit2 changes
​https://bugs.webkit.org/show_bug.cgi?id=108588

Patch by Seulgi Kim <​seulgikim@company100.net> on 2013-02-01
Reviewed by Andreas Kling.

Don't remove WorkQueue during execution.
Following the logic on ​https://bugs.webkit.org/show_bug.cgi?id=108544

• Platform/gtk/WorkQueueGtk.cpp:

(WorkQueue::EventSource::~EventSource):
(WorkQueue::EventSource::executeEventSource):
(WorkQueue::dispatch):
(WorkQueue::dispatchAfterDelay):
(WorkQueue::dispatchOnTermination):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/gtk/WorkQueueGtk.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-01  Seulgi Kim  <seulgikim@company100.net>
+
+        [Gtk][WK2] Fix build after recent WebKit2 changes
+        https://bugs.webkit.org/show_bug.cgi?id=108588
+
+        Reviewed by Andreas Kling.
+
+        Don't remove WorkQueue during execution.
+        Following the logic on https://bugs.webkit.org/show_bug.cgi?id=108544
+
+        * Platform/gtk/WorkQueueGtk.cpp:
+        (WorkQueue::EventSource::~EventSource):
+        (WorkQueue::EventSource::executeEventSource):
+        (WorkQueue::dispatch):
+        (WorkQueue::dispatchAfterDelay):
+        (WorkQueue::dispatchOnTermination):
+
 2013-02-01  Alexis Menard  <alexis@webkit.org>
 

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

@@ -43 +43 @@
     {
     }
+    ~EventSource()
+    {
+        m_workQueue->deref();
+    }
 
     void cancel()
@@ -54 +58 @@
     {
         ASSERT(eventSource);
-        WorkQueue* queue = eventSource->m_workQueue;
-        {
-            MutexLocker locker(queue->m_isValidMutex);
-            if (!queue->m_isValid)
-                return;
-        }
-
         eventSource->m_function();
     }
@@ -207 +204 @@
 void WorkQueue::dispatch(const Function<void()>& function)
 {
+    ref();
     GRefPtr<GSource> dispatchSource = adoptGRef(g_idle_source_new());
     ASSERT(dispatchSource);
@@ -216 +214 @@
 void WorkQueue::dispatchAfterDelay(const Function<void()>& function, double delay)
 {
+    ref();
     GRefPtr<GSource> dispatchSource = adoptGRef(g_timeout_source_new(static_cast<guint>(delay * 1000)));
     ASSERT(dispatchSource);
@@ -224 +223 @@
 void WorkQueue::dispatchOnTermination(WebKit::PlatformProcessIdentifier process, const Function<void()>& function)
 {
+    ref();
     GRefPtr<GSource> dispatchSource = adoptGRef(g_child_watch_source_new(process));
     ASSERT(dispatchSource);