Changeset 90907 in webkit

Timestamp:

Jul 13, 2011 5:32:30 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

[Qt][WK2] Undelayed WorkItems are leaked after execution.
​https://bugs.webkit.org/show_bug.cgi?id=64447

Reviewed by Benjamin Poulain.

• Platform/qt/WorkQueueQt.cpp:

(WorkQueue::WorkItemQt::executeAndDelete):
(WorkQueue::WorkItemQt::timerEvent):
(WorkQueue::scheduleWork):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/qt/WorkQueueQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-13  Andreas Kling  <kling@webkit.org>
+
+        [Qt][WK2] Undelayed WorkItems are leaked after execution.
+        https://bugs.webkit.org/show_bug.cgi?id=64447
+
+        Reviewed by Benjamin Poulain.
+
+        * Platform/qt/WorkQueueQt.cpp:
+        (WorkQueue::WorkItemQt::executeAndDelete):
+        (WorkQueue::WorkItemQt::timerEvent):
+        (WorkQueue::scheduleWork):
+
 2011-07-12  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/Source/WebKit2/Platform/qt/WorkQueueQt.cpp

@@ -66 +66 @@
     }
 
+    Q_SLOT void executeAndDelete()
+    {
+        execute();
+        delete this;
+    }
+
     virtual void timerEvent(QTimerEvent*)
     {
-        execute(); 
-        delete this;
+        executeAndDelete();
     }
 
@@ -109 +114 @@
     WorkQueue::WorkItemQt* itemQt = new WorkQueue::WorkItemQt(this, item.leakPtr());
     itemQt->moveToThread(m_workThread);
-    QMetaObject::invokeMethod(itemQt, "execute", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(itemQt, "executeAndDelete", Qt::QueuedConnection);
 }