Changeset 76515 in webkit

Timestamp:

Jan 24, 2011 6:46:15 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-01-24 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix warnings about unregistering an invalid timer
​https://bugs.webkit.org/show_bug.cgi?id=53006

The ShadowBuffer's purge timer ID was initialized with 0 which lead
to us calling QObject::killTimer(0), causing some qWarnings.

• platform/graphics/qt/ContextShadowQt.cpp: (WebCore::ShadowBuffer::ShadowBuffer): (WebCore::ShadowBuffer::schedulePurge):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ContextShadowQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-24  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix warnings about unregistering an invalid timer
+        https://bugs.webkit.org/show_bug.cgi?id=53006
+
+        The ShadowBuffer's purge timer ID was initialized with 0 which lead
+        to us calling QObject::killTimer(0), causing some qWarnings.
+
+        * platform/graphics/qt/ContextShadowQt.cpp:
+        (WebCore::ShadowBuffer::ShadowBuffer):
+        (WebCore::ShadowBuffer::schedulePurge):
+
 2011-01-21  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp

@@ -58 +58 @@
 ShadowBuffer::ShadowBuffer(QObject* parent)
     : QObject(parent)
-    , timerId(0)
+    , timerId(-1)
 {
 }
@@ -90 +90 @@
 {
     static const double BufferPurgeDelay = 2; // seconds
-    killTimer(timerId);
+    if (timerId >= 0)
+        killTimer(timerId);
     timerId = startTimer(BufferPurgeDelay * 1000);
 }