Changeset 86680 in webkit

Timestamp:

May 17, 2011 10:16:26 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-05-17 Sam Magnuson <​smagnuson@netflix.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Node that have both an opacity and a transform animation on them seem not to fire.
​https://bugs.webkit.org/show_bug.cgi?id=40841

Test: compositing/animation/busy-indicator.html

• platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::GraphicsLayerQtImpl::recache): (WebCore::GraphicsLayerQtImpl::flushChanges): (WebCore::GraphicsLayerQt::setContentsToImage): (WebCore::TransformAnimationQt::getAnimatedProperty): (WebCore::OpacityAnimationQt::getAnimatedProperty): (WebCore::GraphicsLayerQt::addAnimation):

2011-05-17 Sam Magnuson <​smagnuson@netflix.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Node that have both an opacity and a transform animation on them seem not to fire.
​https://bugs.webkit.org/show_bug.cgi?id=40841

• compositing/animation/busy-indicator-no.png: Added.
• compositing/animation/busy-indicator.html: Added.
• compositing/animation/busy-indicator.png: Added.
• compositing/animation/busy-indicator-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/animation/busy-indicator-expected.txt (added)
• LayoutTests/compositing/animation/busy-indicator-no.png (added)
• LayoutTests/compositing/animation/busy-indicator.html (added)
• LayoutTests/compositing/animation/busy-indicator.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-17  Sam Magnuson  <smagnuson@netflix.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Node that have both an opacity and a transform animation on them seem not to fire.
+        https://bugs.webkit.org/show_bug.cgi?id=40841
+
+        * compositing/animation/busy-indicator-no.png: Added.
+        * compositing/animation/busy-indicator.html: Added.
+        * compositing/animation/busy-indicator.png: Added.
+        * compositing/animation/busy-indicator-expected.txt: Added.
+
 2011-05-17  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Sam Magnuson  <smagnuson@netflix.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Node that have both an opacity and a transform animation on them seem not to fire.
+        https://bugs.webkit.org/show_bug.cgi?id=40841
+
+        Test: compositing/animation/busy-indicator.html
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::recache):
+        (WebCore::GraphicsLayerQtImpl::flushChanges):
+        (WebCore::GraphicsLayerQt::setContentsToImage):
+        (WebCore::TransformAnimationQt::getAnimatedProperty):
+        (WebCore::OpacityAnimationQt::getAnimatedProperty):
+        (WebCore::GraphicsLayerQt::addAnimation):
+
 2011-05-17  Grace Kloba  <klobag@chromium.org>
 

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

@@ -793 +793 @@
             if (m_pendingContent.contentType != m_currentContent.contentType)
                 update();
-            if (!m_state.drawsContent && m_layer->drawsContent())
+            else if (!m_state.drawsContent && m_layer->drawsContent())
                 update();
 
@@ -1396 +1396 @@
     }
 
+
+    virtual AnimatedPropertyID animatedProperty() const = 0;
+
     virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
     {
@@ -1529 +1532 @@
     }
 
+    virtual AnimatedPropertyID animatedProperty() const { return AnimatedPropertyWebkitTransform; }
+
     // The idea is that we let WebCore manage the transform operations and Qt just manage the
     // animation heartbeat and the bottom-line QTransform. We gain performance, not by using
@@ -1600 +1605 @@
     }
 
+    virtual AnimatedPropertyID animatedProperty() const { return AnimatedPropertyOpacity; }
+
     virtual void applyFrame(const qreal& fromValue, const qreal& toValue, qreal progress)
     {
@@ -1641 +1648 @@
         if (*it) {
             AnimationQtBase* curAnimation = static_cast<AnimationQtBase*>(it->data());
-            if (curAnimation && curAnimation->m_webkitAnimation == anim)
+            if (curAnimation && curAnimation->m_webkitAnimation == anim
+                && values.property() == curAnimation->animatedProperty()) {
                 newAnim = curAnimation;
+                break;
+            }
         }
     }