[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andreas.kling at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit bf9ce4eb256c5dcbc3635b7d2e823a1b1690ec5a
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 14:46:15 2011 +0000

    2011-01-24  Andreas Kling  <kling at 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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76515 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 62d7d28..1fc222a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-24  Andreas Kling  <kling at 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 at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp b/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp
index 37d6b44..9eb31a7 100644
--- a/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/ContextShadowQt.cpp
@@ -57,7 +57,7 @@ private:
 
 ShadowBuffer::ShadowBuffer(QObject* parent)
     : QObject(parent)
-    , timerId(0)
+    , timerId(-1)
 {
 }
 
@@ -89,7 +89,8 @@ QImage* ShadowBuffer::scratchImage(const QSize& size)
 void ShadowBuffer::schedulePurge()
 {
     static const double BufferPurgeDelay = 2; // seconds
-    killTimer(timerId);
+    if (timerId >= 0)
+        killTimer(timerId);
     timerId = startTimer(BufferPurgeDelay * 1000);
 }
 

-- 
WebKit Debian packaging