Title: [141599] trunk/Source/WebKit2
- Revision
- 141599
- Author
- carlo...@webkit.org
- Date
- 2013-02-01 09:18:16 -0800 (Fri, 01 Feb 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (141598 => 141599)
--- trunk/Source/WebKit2/ChangeLog 2013-02-01 16:34:05 UTC (rev 141598)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-01 17:18:16 UTC (rev 141599)
@@ -1,3 +1,17 @@
+2013-02-01 Carlos Garcia Campos <cgar...@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....@gmail.com>
Unreviewed, rolling out r141319.
Modified: trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp (141598 => 141599)
--- trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2013-02-01 16:34:05 UTC (rev 141598)
+++ trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2013-02-01 17:18:16 UTC (rev 141599)
@@ -42,10 +42,6 @@
, m_cancellable(cancellable)
{
}
- ~EventSource()
- {
- m_workQueue->deref();
- }
void cancel()
{
@@ -91,7 +87,7 @@
public:
Function<void()> m_function;
- WorkQueue* m_workQueue;
+ RefPtr<WorkQueue> m_workQueue;
GCancellable* m_cancellable;
};
@@ -203,7 +199,6 @@
void WorkQueue::dispatch(const Function<void()>& function)
{
- ref();
GRefPtr<GSource> dispatchSource = adoptGRef(g_idle_source_new());
ASSERT(dispatchSource);
g_source_set_priority(dispatchSource.get(), G_PRIORITY_DEFAULT);
@@ -213,7 +208,6 @@
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);
@@ -222,7 +216,6 @@
void WorkQueue::dispatchOnTermination(WebKit::PlatformProcessIdentifier process, const Function<void()>& function)
{
- ref();
GRefPtr<GSource> dispatchSource = adoptGRef(g_child_watch_source_new(process));
ASSERT(dispatchSource);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
