Changeset 76589 in webkit

Timestamp:

Jan 25, 2011 5:46:18 AM (13 years ago)

Author:

krit@webkit.org

Message:

2011-01-25 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

SVG is missing to-animation support for Path
​https://bugs.webkit.org/show_bug.cgi?id=52982

Added an animation test to check 'to' animations in combination with SVG paths.

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

2011-01-25 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

SVG is missing to-animation support for Path
​https://bugs.webkit.org/show_bug.cgi?id=52982

SVG was missing 'to' animation support for SVG paths. Even the fallback to discrete
animation did not work and an assert was thrown, because of the missing m_fromPath.
This also influences a test of the W3C test suite. Subtest 2 of animate-elem-83-t.svg passes now.

Test: svg/animations/animate-path-to-animation.html

• svg/SVGAnimateElement.cpp: (WebCore::SVGAnimateElement::calculateAnimatedValue): Take the value of the last SVGAnimateElement for m_fromPath, since 'to' animations are accumulative. (WebCore::SVGAnimateElement::calculateFromAndToValues): Added support for 'to' animations. (WebCore::SVGAnimateElement::resetToBaseValue): Set m_animatedPath on the first animation element to baseVal.
• svg/SVGPathByteStream.h: (WebCore::SVGPathByteStream::copySVGPathByteStream): Return copy of current byte stream.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animate-path-to-animation-expected.txt (added)
• LayoutTests/svg/animations/animate-path-to-animation.html (added)
• LayoutTests/svg/animations/script-tests/animate-path-to-animation.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimateElement.cpp (modified) (3 diffs)
• Source/WebCore/svg/SVGPathByteStream.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-25  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVG is missing to-animation support for Path
+        https://bugs.webkit.org/show_bug.cgi?id=52982
+
+        Added an animation test to check 'to' animations in combination with SVG paths.
+
+        * svg/animations/animate-path-to-animation-expected.txt: Added.
+        * svg/animations/animate-path-to-animation.html: Added.
+        * svg/animations/script-tests/animate-path-to-animation.js: Added.
+        (sample1):
+        (sample2):
+        (sample3):
+        (executeTest):
+
 2011-01-25  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-25  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVG is missing to-animation support for Path
+        https://bugs.webkit.org/show_bug.cgi?id=52982
+
+        SVG was missing 'to' animation support for SVG paths. Even the fallback to discrete
+        animation did not work and an assert was thrown, because of the missing m_fromPath.
+        This also influences a test of the W3C test suite. Subtest 2 of animate-elem-83-t.svg passes now.
+
+        Test: svg/animations/animate-path-to-animation.html
+
+        * svg/SVGAnimateElement.cpp:
+        (WebCore::SVGAnimateElement::calculateAnimatedValue): Take the value of the last SVGAnimateElement for
+        m_fromPath, since 'to' animations are accumulative.
+        (WebCore::SVGAnimateElement::calculateFromAndToValues): Added support for 'to' animations.
+        (WebCore::SVGAnimateElement::resetToBaseValue): Set m_animatedPath on the first animation element to baseVal.
+        * svg/SVGPathByteStream.h:
+        (WebCore::SVGPathByteStream::copySVGPathByteStream): Return copy of current byte stream.
+
 2011-01-25  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/svg/SVGAnimateElement.cpp

@@ -139 +139 @@
     AnimationMode animationMode = this->animationMode();
     if (m_propertyType == PathProperty) {
+        if (animationMode == ToAnimation) {
+            ASSERT(results->m_animatedPathPointer);
+            m_fromPath = results->m_animatedPathPointer->copy();
+        }
         if (!percentage) {
             ASSERT(m_fromPath);
@@ -211 +215 @@
     } else if (m_propertyType == PathProperty) {
         SVGPathParserFactory* factory = SVGPathParserFactory::self();
-        if (factory->buildSVGPathByteStreamFromString(fromString, m_fromPath, UnalteredParsing)) {
-            if (factory->buildSVGPathByteStreamFromString(toString, m_toPath, UnalteredParsing))
+        if (factory->buildSVGPathByteStreamFromString(toString, m_toPath, UnalteredParsing)) {
+            // For to-animations the from number is calculated later
+            if (animationMode() == ToAnimation || factory->buildSVGPathByteStreamFromString(fromString, m_fromPath, UnalteredParsing))
                 return true;
         }
@@ -273 +278 @@
     } else if (m_propertyType == PathProperty) {
         m_animatedPath.clear();
-        m_animatedPathPointer = 0;
+        SVGPathParserFactory* factory = SVGPathParserFactory::self();
+        factory->buildSVGPathByteStreamFromString(baseString, m_animatedPath, UnalteredParsing);
+        m_animatedPathPointer = m_animatedPath.get();
         return;
     } else if (m_propertyType == PointsProperty) {

trunk/Source/WebCore/svg/SVGPathByteStream.h

@@ -52 +52 @@
     }
 
+    PassOwnPtr<SVGPathByteStream> copy()
+    {
+        return adoptPtr(new SVGPathByteStream(m_data));
+    }
+
     typedef Vector<unsigned char> Data;
     typedef Data::const_iterator DataIterator;
@@ -63 +68 @@
 private:
     SVGPathByteStream() { }
+    SVGPathByteStream(Data& data)
+        : m_data(data)
+    {
+    }
+
     Data m_data;
 };