Changeset 141599 in webkit

Timestamp:

Feb 1, 2013 9:18:16 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Adapt WorkQueueGtk to the latest changes in WebKit2 after r141497
​https://bugs.webkit.org/show_bug.cgi?id=108607

Reviewed by Anders Carlsson.

• Platform/gtk/WorkQueueGtk.cpp:

(WorkQueue::EventSource::executeEventSource): Remove the is valid
work queue check.
(WorkQueue::EventSource): WorkQueue is now refcounted, so keep a
reference when a new job is scheduled and unref it when it
finishes.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Adapt WorkQueueGtk to the latest changes in WebKit2 after r141497
+        https://bugs.webkit.org/show_bug.cgi?id=108607
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/gtk/WorkQueueGtk.cpp:
+        (WorkQueue::EventSource::executeEventSource): Remove the is valid
+        work queue check.
+        (WorkQueue::EventSource): WorkQueue is now refcounted, so keep a
+        reference when a new job is scheduled and unref it when it
+        finishes.
+
 2013-02-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -43 +43 @@
     {
     }
-    ~EventSource()
-    {
-        m_workQueue->deref();
-    }
 
     void cancel()
@@ -92 +88 @@
 public:
     Function<void()> m_function;
-    WorkQueue* m_workQueue;
+    RefPtr<WorkQueue> m_workQueue;
     GCancellable* m_cancellable;
 };
@@ -204 +200 @@
 void WorkQueue::dispatch(const Function<void()>& function)
 {
-    ref();
     GRefPtr<GSource> dispatchSource = adoptGRef(g_idle_source_new());
     ASSERT(dispatchSource);
@@ -214 +209 @@
 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);
@@ -223 +217 @@
 void WorkQueue::dispatchOnTermination(WebKit::PlatformProcessIdentifier process, const Function<void()>& function)
 {
-    ref();
     GRefPtr<GSource> dispatchSource = adoptGRef(g_child_watch_source_new(process));
     ASSERT(dispatchSource);