Changeset 175525 in webkit

Timestamp:

Nov 4, 2014, 1:20:52 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix animation of orient attribute on marker element
​https://bugs.webkit.org/show_bug.cgi?id=137942

Source/WebCore:

Patch by Nikos Andronikos <​nikos.andronikos-webkit@cisra.canon.com.au> on 2014-11-04
Reviewed by Dirk Schulze.

Fixed implementation of SVG animated angles and the SVG
marker element orient attribute.
SVG animated angle was missing the logic to support animation
from auto to a numeric angle value - this is now added.
The SVG marker element getter for orientType was not returning
the animated value for orientType so in some cases (i.e. when
the initial value and the animated values were of different types)
the animation was not being rendered - although it was running.

Tests: svg/animations/animate-marker-orienttype-1.html

svg/animations/animate-marker-orienttype-2.html
svg/animations/animate-marker-orienttype-3.html

• svg/SVGAnimatedAngle.cpp:

(WebCore::SVGAnimatedAngleAnimator::calculateAnimatedValue):
Added logic to support auto to angle animation.

• svg/SVGMarkerElement.cpp:

(WebCore::SVGMarkerElement::orientType):
This method now returns the animated value if an animation is
running.

• svg/SVGMarkerElement.h:

LayoutTests:

Patch by Nikos Andrkos Andronikos <​nikos.andronikos-webkit@cisra.canon.com.au> on 2014-11-04
Reviewed by Dirk Schulze.

Test the rendered result of the animation of the orient attribute.
Existing tests were only testing the animated value in the DOM.

• svg/animations/animate-marker-orienttype-1-expected.txt: Added.
• svg/animations/animate-marker-orienttype-1.html: Added.
• svg/animations/animate-marker-orienttype-2-expected.txt: Added.
• svg/animations/animate-marker-orienttype-2.html: Added.
• svg/animations/animate-marker-orienttype-3-expected.txt: Added.
• svg/animations/animate-marker-orienttype-3.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animate-marker-orienttype-1-expected.txt (added)
• LayoutTests/svg/animations/animate-marker-orienttype-1.html (added)
• LayoutTests/svg/animations/animate-marker-orienttype-2-expected.txt (added)
• LayoutTests/svg/animations/animate-marker-orienttype-2.html (added)
• LayoutTests/svg/animations/animate-marker-orienttype-3-expected.txt (added)
• LayoutTests/svg/animations/animate-marker-orienttype-3.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimatedAngle.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGMarkerElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGMarkerElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-04  Nikos Andrkos Andronikos  <nikos.andronikos-webkit@cisra.canon.com.au>
+
+        Fix animation of orient attribute on marker element
+        https://bugs.webkit.org/show_bug.cgi?id=137942
+
+        Reviewed by Dirk Schulze.
+
+        Test the rendered result of the animation of the orient attribute.
+        Existing tests were only testing the animated value in the DOM.
+
+        * svg/animations/animate-marker-orienttype-1-expected.txt: Added.
+        * svg/animations/animate-marker-orienttype-1.html: Added.
+        * svg/animations/animate-marker-orienttype-2-expected.txt: Added.
+        * svg/animations/animate-marker-orienttype-2.html: Added.
+        * svg/animations/animate-marker-orienttype-3-expected.txt: Added.
+        * svg/animations/animate-marker-orienttype-3.html: Added.
+
 2014-11-03  Shivakumar JM  <shiva.jm@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-04  Nikos Andronikos  <nikos.andronikos-webkit@cisra.canon.com.au>
+
+        Fix animation of orient attribute on marker element
+        https://bugs.webkit.org/show_bug.cgi?id=137942
+
+        Reviewed by Dirk Schulze.
+
+        Fixed implementation of SVG animated angles and the SVG
+        marker element orient attribute.
+        SVG animated angle was missing the logic to support animation
+        from auto to a numeric angle value - this is now added.
+        The SVG marker element getter for orientType was not returning
+        the animated value for orientType so in some cases (i.e. when
+        the initial value and the animated values were of different types)
+        the animation was not being rendered - although it was running.
+
+        Tests: svg/animations/animate-marker-orienttype-1.html
+               svg/animations/animate-marker-orienttype-2.html
+               svg/animations/animate-marker-orienttype-3.html
+
+        * svg/SVGAnimatedAngle.cpp:
+        (WebCore::SVGAnimatedAngleAnimator::calculateAnimatedValue):
+        Added logic to support auto to angle animation.
+        * svg/SVGMarkerElement.cpp:
+        (WebCore::SVGMarkerElement::orientType):
+        This method now returns the animated value if an animation is
+        running.
+        * svg/SVGMarkerElement.h:
+
 2014-11-03  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp

@@ -97 +97 @@
 
     if (fromAngleAndEnumeration.second != toAngleAndEnumeration.second) {
-        // Animating from eg. auto to 90deg, or auto to 90deg.
-        if (fromAngleAndEnumeration.second == SVGMarkerOrientAngle) {
-            // Animating from an angle value to eg. 'auto' - this disabled additive as 'auto' is a keyword..
-            if (toAngleAndEnumeration.second == SVGMarkerOrientAuto) {
-                if (percentage < 0.5f) {
-                    animatedAngleAndEnumeration.first = fromAngleAndEnumeration.first;
-                    animatedAngleAndEnumeration.second = SVGMarkerOrientAngle;
-                    return;
-                }
+        // Discrete animation - no linear interpolation possible between values (e.g. auto to angle).
+        if (percentage < 0.5f) {
+            animatedAngleAndEnumeration.second = fromAngleAndEnumeration.second;
+            if (fromAngleAndEnumeration.second == SVGMarkerOrientAngle)
+                animatedAngleAndEnumeration.first = fromAngleAndEnumeration.first;
+            else
                 animatedAngleAndEnumeration.first.setValue(0);
-                animatedAngleAndEnumeration.second = SVGMarkerOrientAuto;
-                return;
-            }
-            animatedAngleAndEnumeration.first.setValue(0);
-            animatedAngleAndEnumeration.second = SVGMarkerOrientUnknown;
             return;
         }
+        animatedAngleAndEnumeration.second = toAngleAndEnumeration.second;
+        if (toAngleAndEnumeration.second == SVGMarkerOrientAngle)
+            animatedAngleAndEnumeration.first = toAngleAndEnumeration.first;
+        else
+            animatedAngleAndEnumeration.first.setValue(0);
+        return;
     }
 

trunk/Source/WebCore/svg/SVGMarkerElement.cpp

@@ -249 +249 @@
         (&ownerType, orientTypePropertyInfo(), ownerType.m_orientType.value);
 }
-  
+
+SVGMarkerOrientType& SVGMarkerElement::orientType() const
+{
+    if (SVGAnimatedEnumeration* wrapper = SVGAnimatedProperty::lookupWrapper<UseOwnerType, SVGAnimatedEnumeration>(this, orientTypePropertyInfo())) {
+        if (wrapper->isAnimating()) {
+            ASSERT(wrapper->currentAnimatedValue() >= 0 && wrapper->currentAnimatedValue() < SVGMarkerOrientMax);
+            return reinterpret_cast<SVGMarkerOrientType&>(wrapper->currentAnimatedValue());
+        }
+    }
+    return m_orientType.value;
+}
+
 PassRefPtr<SVGAnimatedEnumerationPropertyTearOff<SVGMarkerOrientType>> SVGMarkerElement::orientTypeAnimated()
 {

trunk/Source/WebCore/svg/SVGMarkerElement.h

@@ -43 +43 @@
     SVGMarkerOrientUnknown = 0,
     SVGMarkerOrientAuto,
-    SVGMarkerOrientAngle
+    SVGMarkerOrientAngle,
+
+    // Add new elements before here.
+    SVGMarkerOrientMax
 };
 
@@ -156 +159 @@
     static void synchronizeOrientType(SVGElement* contextElement);
     static PassRefPtr<SVGAnimatedProperty> lookupOrCreateOrientTypeWrapper(SVGElement* contextElement);
-    SVGMarkerOrientType& orientType() const { return m_orientType.value; }
+    SVGMarkerOrientType& orientType() const;
     SVGMarkerOrientType& orientTypeBaseValue() const { return m_orientType.value; }
     void setOrientTypeBaseValue(const SVGMarkerOrientType& type) { m_orientType.value = type; }