Changeset 65795 in webkit

Timestamp:

Aug 23, 2010 12:59:48 AM (14 years ago)

Author:

ariya@webkit.org

Message:

[Qt] Crash when purging the scratch buffer for the shadow
​https://bugs.webkit.org/show_bug.cgi?id=44384

Patch by Ariya Hidayat <​ariya@sencha.com> on 2010-08-23
Reviewed by Kenneth Rohde Christiansen.

WebCore::Timer can't be used in a static object bcause it relies on
thread global data, which is invalid once the application instance is
destroyed. To overcome the problem, use QObject's timer support for
the ShadowBuffer class.

• platform/graphics/qt/ContextShadow.cpp:

(WebCore::):
(WebCore::ShadowBuffer::ShadowBuffer):
(WebCore::ShadowBuffer::schedulePurge):
(WebCore::ShadowBuffer::timerEvent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ContextShadow.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Ariya Hidayat  <ariya@sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Crash when purging the scratch buffer for the shadow
+        https://bugs.webkit.org/show_bug.cgi?id=44384
+
+        WebCore::Timer can't be used in a static object bcause it relies on
+        thread global data, which is invalid once the application instance is
+        destroyed. To overcome the problem, use QObject's timer support for
+        the ShadowBuffer class.
+
+        * platform/graphics/qt/ContextShadow.cpp:
+        (WebCore::):
+        (WebCore::ShadowBuffer::ShadowBuffer):
+        (WebCore::ShadowBuffer::schedulePurge):
+        (WebCore::ShadowBuffer::timerEvent):
+
 2010-08-23  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/platform/graphics/qt/ContextShadow.cpp

@@ -29 +29 @@
 #include "ContextShadow.h"
 
-#include "Timer.h"
+#include <QTimerEvent>
 #include <wtf/Noncopyable.h>
 
@@ -38 +38 @@
 // we create a buffer which will be automatically purged via a timer.
 
-class ShadowBuffer: public Noncopyable {
+class ShadowBuffer: public QObject {
 public:
-    ShadowBuffer();
+    ShadowBuffer(QObject* parent = 0);
 
     QImage* scratchImage(const QSize& size);
 
     void schedulePurge();
+
+protected:
+    void timerEvent(QTimerEvent* event);
 
 private:
     QImage image;
-    void purgeBuffer(Timer<ShadowBuffer>*);
-    Timer<ShadowBuffer> purgeTimer;
+    int timerId;
 };
 
-ShadowBuffer::ShadowBuffer()
-    : purgeTimer(this, &ShadowBuffer::purgeBuffer)
+ShadowBuffer::ShadowBuffer(QObject* parent)
+    : QObject(parent)
+    , timerId(0)
 {
 }
@@ -85 +88 @@
 {
     static const double BufferPurgeDelay = 2; // seconds
-    purgeTimer.startOneShot(BufferPurgeDelay);
-}
-
-void ShadowBuffer::purgeBuffer(Timer<ShadowBuffer>*)
-{
-    image = QImage();
+    killTimer(timerId);
+    timerId = startTimer(BufferPurgeDelay * 1000);
+}
+
+void ShadowBuffer::timerEvent(QTimerEvent* event)
+{
+    if (event->timerId() == timerId) {
+        killTimer(timerId);
+        image = QImage();
+    }
+    QObject::timerEvent(event);
 }