Changeset 56685 in webkit

Timestamp:

Mar 28, 2010 2:46:06 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-28 Kim Grönholm <​kim.gronholm@nomovok.com>

Reviewed by Simon Hausmann.

[Qt] GraphicsLayer: Timing functions don't work with transitions
​https://bugs.webkit.org/show_bug.cgi?id=36589

If the animation value doesn't have timing function set, we need to
use the animation's timing function.

Fixed also a bug in passing the duration to solveCubicBezierFunction.
The duration was divided two times by 1000 and meanwhile casted to int.
It needs to be kept as double and divided by 1000 only once.

Test case: ​https://bugs.webkit.org/attachment.cgi?id=51619

• platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::applyTimingFunction): (WebCore::AnimationQt:::AnimationQtBase): (WebCore::AnimationQt::updateCurrentTime):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsLayerQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-28  Kim Grönholm  <kim.gronholm@nomovok.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] GraphicsLayer: Timing functions don't work with transitions
+        https://bugs.webkit.org/show_bug.cgi?id=36589
+
+        If the animation value doesn't have timing function set, we need to
+        use the animation's timing function.
+        
+        Fixed also a bug in passing the duration to solveCubicBezierFunction.
+        The duration was divided two times by 1000 and meanwhile casted to int.
+        It needs to be kept as double and divided by 1000 only once.
+
+        Test case: https://bugs.webkit.org/attachment.cgi?id=51619
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::applyTimingFunction):
+        (WebCore::AnimationQt:::AnimationQtBase):
+        (WebCore::AnimationQt::updateCurrentTime):
+
 2010-03-27  Joseph Pecoraro  <joepeck@webkit.org>
 

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

@@ -972 +972 @@
 // we want the timing function to be as close as possible to what the web-developer intended, so we're using the same function used by WebCore when compositing is disabled
 // Using easing-curves would probably work for some of the cases, but wouldn't really buy us anything as we'd have to convert the bezier function back to an easing curve
-static inline qreal applyTimingFunction(const TimingFunction& timingFunction, qreal progress, int duration)
-{
-        if (timingFunction.type() == LinearTimingFunction)
-            return progress;
-        if (timingFunction.type() == CubicBezierTimingFunction) {
-            return solveCubicBezierFunction(timingFunction.x1(),
-                                            timingFunction.y1(),
-                                            timingFunction.x2(),
-                                            timingFunction.y2(),
-                                            double(progress), double(duration) / 1000);
-        }
+static inline qreal applyTimingFunction(const TimingFunction& timingFunction, qreal progress, double duration)
+{
+    if (timingFunction.type() == LinearTimingFunction)
         return progress;
+    if (timingFunction.type() == CubicBezierTimingFunction) {
+        return solveCubicBezierFunction(timingFunction.x1(),
+                                        timingFunction.y1(),
+                                        timingFunction.x2(),
+                                        timingFunction.y2(),
+                                        double(progress), double(duration) / 1000);
+    }
+    return progress;
 }
 
@@ -1056 +1056 @@
             if (animationValue->timingFunction())
                 keyframeValue.timingFunction = *animationValue->timingFunction();
+            else
+                keyframeValue.timingFunction = anim->timingFunction();
             webkitAnimationToQtAnimationValue(animationValue, keyframeValue.value);
             m_keyframeValues[animationValue->keyTime()] = keyframeValue;
@@ -1104 +1106 @@
         progress = (!progress || progress == 1 || it.key() == it2.key())
                                          ? progress
-                                         : applyTimingFunction(timingFunc, (progress - it.key()) / (it2.key() - it.key()), duration() / 1000);
+                                         : applyTimingFunction(timingFunc, (progress - it.key()) / (it2.key() - it.key()), duration());
         applyFrame(fromValue, toValue, progress);
     }