Changeset 95907 in webkit

Timestamp:

Sep 24, 2011 1:17:38 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

SVGAnimation does not support 'values' for from-to animations
​https://bugs.webkit.org/show_bug.cgi?id=64859

Patch by Young Han Lee <​joybro@company100.net> on 2011-09-24
Reviewed by Dirk Schulze.

If from-to animation have discrete calc-mode and have a 'keyTimes' list, values of
the keyTimes indicate the begin and the end of the animation respectively.[1][2]

When keyTimes is given, calculate the progress percentage of the animation with it
even for from-to animation.

[1] ​http://www.w3.org/TR/SVG/animate.html#ValueAttributes
[2] ​http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncValues

Source/WebCore:

Test: svg/animations/animate-from-to-keyTimes.html

• svg/SVGAnimationElement.cpp:

(WebCore::SVGAnimationElement::calculatePercentForFromTo):
(WebCore::SVGAnimationElement::updateAnimation):

• svg/SVGAnimationElement.h:

LayoutTests:

• svg/animations/animate-from-to-keyTimes-expected.txt: Added.
• svg/animations/animate-from-to-keyTimes.html: Added.
• svg/animations/script-tests/animate-from-to-keyTimes.js: Added.

(sample1):
(sample2):
(executeTest):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animate-from-to-keyTimes-expected.txt (added)
• LayoutTests/svg/animations/animate-from-to-keyTimes.html (added)
• LayoutTests/svg/animations/script-tests/animate-from-to-keyTimes.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimationElement.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGAnimationElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-24  Young Han Lee  <joybro@company100.net>
+
+        SVGAnimation does not support 'values' for from-to animations
+        https://bugs.webkit.org/show_bug.cgi?id=64859
+
+        Reviewed by Dirk Schulze.
+
+        If from-to animation have discrete calc-mode and have a 'keyTimes' list, values of
+        the keyTimes indicate the begin and the end of the animation respectively.[1][2]
+
+        When keyTimes is given, calculate the progress percentage of the animation with it
+        even for from-to animation.
+
+        [1] http://www.w3.org/TR/SVG/animate.html#ValueAttributes
+        [2] http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncValues
+
+        * svg/animations/animate-from-to-keyTimes-expected.txt: Added.
+        * svg/animations/animate-from-to-keyTimes.html: Added.
+        * svg/animations/script-tests/animate-from-to-keyTimes.js: Added.
+        (sample1):
+        (sample2):
+        (executeTest):
+
 2011-09-23  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-24  Young Han Lee  <joybro@company100.net>
+
+        SVGAnimation does not support 'values' for from-to animations
+        https://bugs.webkit.org/show_bug.cgi?id=64859
+
+        Reviewed by Dirk Schulze.
+
+        If from-to animation have discrete calc-mode and have a 'keyTimes' list, values of
+        the keyTimes indicate the begin and the end of the animation respectively.[1][2]
+
+        When keyTimes is given, calculate the progress percentage of the animation with it
+        even for from-to animation.
+
+        [1] http://www.w3.org/TR/SVG/animate.html#ValueAttributes
+        [2] http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncValues
+
+        Test: svg/animations/animate-from-to-keyTimes.html
+
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::calculatePercentForFromTo):
+        (WebCore::SVGAnimationElement::updateAnimation):
+        * svg/SVGAnimationElement.h:
+
 2011-09-23  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/svg/SVGAnimationElement.cpp

@@ -462 +462 @@
     return (toKeyPoint - fromKeyPoint) * keyPointPercent + fromKeyPoint;
 }
+
+float SVGAnimationElement::calculatePercentForFromTo(float percent) const
+{
+    if (calcMode() == CalcModeDiscrete && m_keyTimes.size() == 2)
+        return percent > m_keyTimes[1] ? 1 : 0;
+
+    return percent;
+}
     
 void SVGAnimationElement::currentValuesFromKeyPoints(float percent, float& effectivePercent, String& from, String& to) const
@@ -609 +617 @@
     else if (m_keyPoints.isEmpty() && mode == CalcModeSpline && m_keyTimes.size() > 1)
         effectivePercent = calculatePercentForSpline(percent, calculateKeyTimesIndex(percent));
+    else if (animationMode() == FromToAnimation || animationMode() == ToAnimation)
+        effectivePercent = calculatePercentForFromTo(percent);
     else
         effectivePercent = percent;

trunk/Source/WebCore/svg/SVGAnimationElement.h

@@ -121 +121 @@
     void currentValuesFromKeyPoints(float percent, float& effectivePercent, String& from, String& to) const;
     float calculatePercentForSpline(float percent, unsigned splineIndex) const;
+    float calculatePercentForFromTo(float percent) const;
     unsigned calculateKeyTimesIndex(float percent) const;