Changeset 57818 in webkit

Timestamp:

Apr 19, 2010 11:00:58 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-19 Balazs Kelemen <​kb@inf.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Destroy SharedTimerQt before destruction of QCoreApplication.

To avoid unsafe situations caused by running WebCore code (through firing timers) when destruction of QCoreApplication
has been started, we should explicitly destroy the SharedTimerQt instance on application exit.
We can achieve that through installing a self-destroying slot for the QCoreApplication::aboutToQuit() signal
into the SharedTimerQt instance.

​https://bugs.webkit.org/show_bug.cgi?id=36832

No functional change so no new tests.

• platform/qt/SharedTimerQt.cpp: (WebCore::SharedTimerQt::SharedTimerQt): (WebCore::SharedTimerQt::destroy): (WebCore::SharedTimerQt::inst):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/SharedTimerQt.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-19  Balazs Kelemen  <kb@inf.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Destroy SharedTimerQt before destruction of QCoreApplication.
+
+        To avoid unsafe situations caused by running WebCore code (through firing timers) when destruction of QCoreApplication
+        has been started, we should explicitly destroy the SharedTimerQt instance on application exit.
+        We can achieve that through installing a self-destroying slot for the QCoreApplication::aboutToQuit() signal
+        into the SharedTimerQt instance.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36832
+
+        No functional change so no new tests.
+
+        * platform/qt/SharedTimerQt.cpp:
+        (WebCore::SharedTimerQt::SharedTimerQt):
+        (WebCore::SharedTimerQt::destroy):
+        (WebCore::SharedTimerQt::inst):
+
 2010-04-19  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/platform/qt/SharedTimerQt.cpp

@@ -41 +41 @@
 
 class SharedTimerQt : public QObject {
+    Q_OBJECT
+
     friend void setSharedTimerFiredFunction(void (*f)());
 public:
@@ -51 +53 @@
     void timerEvent(QTimerEvent* ev);
 
+private slots:
+    void destroy();
+
 private:
-    SharedTimerQt(QObject* parent);
+    SharedTimerQt();
     ~SharedTimerQt();
     QBasicTimer m_timer;
@@ -58 +63 @@
 };
 
-SharedTimerQt::SharedTimerQt(QObject* parent)
-    : QObject(parent)
+SharedTimerQt::SharedTimerQt()
+    : QObject()
     , m_timerFunction(0)
 {}
@@ -69 +74 @@
 }
 
+void SharedTimerQt::destroy()
+{
+    delete this;
+}
+
 SharedTimerQt* SharedTimerQt::inst()
 {
     static QPointer<SharedTimerQt> timer;
-    if (!timer)
-        timer = new SharedTimerQt(QCoreApplication::instance());
+    if (!timer) {
+        timer = new SharedTimerQt();
+        timer->connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(destroy()));
+    }
 
     return timer;
@@ -130 +142 @@
 }
 
+#include "SharedTimerQt.moc"
+
 }