Changeset 90345 in webkit

Timestamp:

Jul 3, 2011 1:22:22 PM (13 years ago)

Author:

krit@webkit.org

Message:

2011-07-03 Dirk Schulze <​krit@webkit.org>

SVGAnimateTransform accumulate=sum restarts on every repeat
​https://bugs.webkit.org/show_bug.cgi?id=63876

Reviewed by Nikolas Zimmermann.

Test accumulate=sum on SVGAnimateTransform. The animation shouldn't start with initial value
on every repeat for accumulation.

• svg/animations/script-tests/svgtransform-animation-1.js: Added. (sample1): (sample2): (sample3): (executeTest):
• svg/animations/svgtransform-animation-1-expected.txt: Added.
• svg/animations/svgtransform-animation-1.html: Added.

2011-07-03 Dirk Schulze <​krit@webkit.org>

SVGAnimateTransform accumulate=sum restarts on every repeat
​https://bugs.webkit.org/show_bug.cgi?id=63876

Reviewed by Nikolas Zimmermann.

We applied transforms from previous animation repeats to a transform list. The problem is, that we calculated the current
transform based on the percentage of the current repeat count. This causes an animation starting from scale level 0
on every repeat. Now I add the repeat count to the current percentage, so that the distance calculation starts from 100% on
the first repeat, from 200% on the second and so on.

Test: svg/animations/svgtransform-animation-1.html

• svg/SVGAnimateTransformElement.cpp: (WebCore::SVGAnimateTransformElement::calculateAnimatedValue):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/Skipped (modified) (1 diff)
• LayoutTests/svg/animations/script-tests/svgtransform-animation-1.js (added)
• LayoutTests/svg/animations/svgtransform-animation-1-expected.txt (added)
• LayoutTests/svg/animations/svgtransform-animation-1.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimateTransformElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-03  Dirk Schulze  <krit@webkit.org>
+
+        SVGAnimateTransform accumulate=sum restarts on every repeat
+        https://bugs.webkit.org/show_bug.cgi?id=63876
+
+        Reviewed by Nikolas Zimmermann.
+        
+        Test accumulate=sum on SVGAnimateTransform. The animation shouldn't start with initial value
+        on every repeat for accumulation.
+
+        * svg/animations/script-tests/svgtransform-animation-1.js: Added.
+        (sample1):
+        (sample2):
+        (sample3):
+        (executeTest):
+        * svg/animations/svgtransform-animation-1-expected.txt: Added.
+        * svg/animations/svgtransform-animation-1.html: Added.
+
 2011-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/platform/wk2/Skipped

@@ -494 +494 @@
 svg/animations/svgrect-animation-1.html
 svg/animations/svgrect-animation-2.html
+svg/animations/svgtransform-animation-1.html
 svg/animations/svgstring-animation-fallback-to-discrete.html
 svg/custom/absolute-sized-content-with-resources.xhtml

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-03  Dirk Schulze  <krit@webkit.org>
+
+        SVGAnimateTransform accumulate=sum restarts on every repeat
+        https://bugs.webkit.org/show_bug.cgi?id=63876
+
+        Reviewed by Nikolas Zimmermann.
+        
+        We applied transforms from previous animation repeats to a transform list. The problem is, that we calculated the current
+        transform based on the percentage of the current repeat count. This causes an animation starting from scale level 0
+        on every repeat. Now I add the repeat count to the current percentage, so that the distance calculation starts from 100% on
+        the first repeat, from 200% on the second and so on.
+
+        Test: svg/animations/svgtransform-animation-1.html
+
+        * svg/SVGAnimateTransformElement.cpp:
+        (WebCore::SVGAnimateTransformElement::calculateAnimatedValue):
+
 2011-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/svg/SVGAnimateTransformElement.cpp

@@ -162 +162 @@
     if (!isAdditive())
         transformList->clear();
-    if (isAccumulated() && repeat) {
-        SVGTransform accumulatedTransform = SVGTransformDistance(m_fromTransform, m_toTransform).scaledDistance(repeat).addToSVGTransform(SVGTransform());
-        transformList->append(accumulatedTransform);
-    }
+    if (isAccumulated() && repeat)
+        percentage += repeat;
     SVGTransform transform = SVGTransformDistance(m_fromTransform, m_toTransform).scaledDistance(percentage).addToSVGTransform(m_fromTransform);
     transformList->append(transform);