Changeset 57770 in webkit

Timestamp:

Apr 16, 2010 7:04:50 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-16 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Antti Koivisto.

[Qt] GraphicsLayer: support fill-modes
​https://bugs.webkit.org/show_bug.cgi?id=36216

Remove LayoutTests/animations/fill-mode-transform.html from the skip list

• platform/qt/Skipped:

2010-04-16 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Antti Koivisto.

[Qt] GraphicsLayer: support fill-modes
​https://bugs.webkit.org/show_bug.cgi?id=36216
Implement the CSS-animation "fill mode" concept in GraphicsLayerQt. The concept
enables a key-frame animation to go to the animation's starting point before the delay,
and/or to stay at the animation's ending point after its ended, without reverting to the default
value.
We do that by manually setting the value to keyframe-0 before the delay if fill-mode is backwards/both,
and manually modifying the default value to the animated value as we animate, with fill-mode forwards/both.

• platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::AnimationQtBase::AnimationQtBase): (WebCore::TransformAnimationQt::~TransformAnimationQt): (WebCore::TransformAnimationQt::applyFrame): (WebCore::GraphicsLayerQt::addAnimation):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/GraphicsLayerQt.cpp (modified) (9 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-16  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] GraphicsLayer: support fill-modes
+        https://bugs.webkit.org/show_bug.cgi?id=36216
+
+        Remove LayoutTests/animations/fill-mode-transform.html from the skip list
+
+        * platform/qt/Skipped:
+
 2010-04-16  Dmitry Titov  <dimich@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5217 +5217 @@
 fast/multicol/hit-test-above-or-below.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=36191
-#[Qt] GraphicsLayer: fix test regressions
-animations/fill-mode-transform.html
 animations/simultaneous-start-left.html
 # https://bugs.webkit.org/show_bug.cgi?id=37381

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-16  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] GraphicsLayer: support fill-modes
+        https://bugs.webkit.org/show_bug.cgi?id=36216
+        Implement the CSS-animation "fill mode" concept in GraphicsLayerQt. The concept
+        enables a key-frame animation to go to the animation's starting point before the delay,
+        and/or to stay at the animation's ending point after its ended, without reverting to the default
+        value.
+        We do that by manually setting the value to keyframe-0 before the delay if fill-mode is backwards/both,
+        and manually modifying the default value to the animated value as we animate, with fill-mode forwards/both.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::AnimationQtBase::AnimationQtBase):
+        (WebCore::TransformAnimationQt::~TransformAnimationQt):
+        (WebCore::TransformAnimationQt::applyFrame):
+        (WebCore::GraphicsLayerQt::addAnimation):
+
 2010-04-16  Gavin Barraclough  <barraclough@apple.com>
 

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

@@ -996 +996 @@
         , m_webkitAnimation(anim)
         , m_keyframesName(name)
+        , m_fillsForwards(false)
     {
     }
@@ -1019 +1020 @@
     const Animation* m_webkitAnimation;
     QString m_keyframesName;
+    bool m_fillsForwards;
 };
 
@@ -1103 +1105 @@
     ~TransformAnimationQt()
     {
-        // this came up during the compositing/animation LayoutTests
-        // when the animation dies, the transform has to go back to default
-        if (m_layer)
-            m_layer.data()->updateTransform();
+        if (m_fillsForwards)
+            setCurrentTime(1);
+        else
+            m_layer.data()->setBaseTransform(m_layer.data()->m_layer->transform());
     }
 
@@ -1145 +1147 @@
         }
         m_layer.data()->setBaseTransform(transformMatrix);
+        if (m_fillsForwards)
+            m_layer.data()->m_layer->setTransform(m_layer.data()->m_baseTransform);
     }
 
@@ -1174 +1178 @@
     }
 
+    ~OpacityAnimationQt()
+    {
+        if (m_fillsForwards)
+            setCurrentTime(1);
+        else
+            m_layer.data()->setOpacity(m_layer.data()->m_layer->opacity());
+    }
     virtual void applyFrame(const qreal& fromValue, const qreal& toValue, qreal progress)
     {
@@ -1184 +1195 @@
 
         m_layer.data()->setOpacity(opacity);
+        if (m_fillsForwards)
+            m_layer.data()->m_layer->setOpacity(opacity);
     }
 
@@ -1200 +1213 @@
         return false;
 
-    QAbstractAnimation* newAnim = 0;
+    AnimationQtBase* newAnim = 0;
 
     // fixed: we might already have the Qt animation object associated with this WebCore::Animation object
@@ -1225 +1238 @@
         // we make sure WebCore::Animation and QAnimation are on the same terms
         newAnim->setLoopCount(anim->iterationCount());
+        newAnim->m_fillsForwards = anim->fillsForwards();
         m_impl->m_animations.append(QWeakPointer<QAbstractAnimation>(newAnim));
         QObject::connect(&m_impl->m_suspendTimer, SIGNAL(timeout()), newAnim, SLOT(resume()));
@@ -1231 +1245 @@
     // flush now or flicker...
     m_impl->flushChanges(false);
+
+    // when fill-mode is backwards/both, we set the value to 0 before the delay takes place
+    if (anim->fillsBackwards())
+        newAnim->setCurrentTime(0);
 
     if (anim->delay())