[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f2242015fcf0e2f4c049ae875ed998eef51aa651
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 07:14:33 2010 +0000

    2010-02-10  Noam Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] GraphicsLayer: somtimes the item flickers at the end of an animation
            This is because we try to delete the animation when finished: that is
            unnecessary. WebCore manages the animation's lifecycle and makes sure
            to call the right function when the animation can be deleted.
    
            https://bugs.webkit.org/show_bug.cgi?id=34761
    
            No new tests.
    
            * platform/graphics/qt/GraphicsLayerQt.cpp:
            (WebCore::GraphicsLayerQt::addAnimation): No need to delete here
            (WebCore::GraphicsLayerQt::removeAnimationsForProperty): deleteLater
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5e4ce20..9412e78 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-10  Noam Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] GraphicsLayer: somtimes the item flickers at the end of an animation
+        This is because we try to delete the animation when finished: that is
+        unnecessary. WebCore manages the animation's lifecycle and makes sure
+        to call the right function when the animation can be deleted.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34761
+
+        No new tests.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQt::addAnimation): No need to delete here
+        (WebCore::GraphicsLayerQt::removeAnimationsForProperty): deleteLater
+
 2010-02-10  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix for wxMac/Cocoa.
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 3a0d1ba..11f7384 100644
--- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -1117,7 +1117,8 @@ bool GraphicsLayerQt::addAnimation(const KeyframeValueList& values, const IntSiz
     else
         newAnim->start();
 
-    QObject::connect(newAnim, SIGNAL(finished()), newAnim, SLOT(deleteLater()));
+    // we don't need to manage the animation object's lifecycle:
+    // WebCore would call removeAnimations when it's time to delete.
 
     return true;
 }
@@ -1128,7 +1129,7 @@ void GraphicsLayerQt::removeAnimationsForProperty(AnimatedPropertyID id)
         if (*it) {
             AnimationQtBase* anim = static_cast<AnimationQtBase*>(it->data());
             if (anim && anim->m_webkitPropertyID == id) {
-                delete anim;
+                anim->deleteLater();
                 it = m_impl->m_animations.erase(it);
                 --it;
             }

-- 
WebKit Debian packaging