Changeset 153433 in webkit

Timestamp:

Jul 29, 2013, 10:45:51 AM (12 years ago)

Author:

reni@webkit.org

Message:

ASSERT_NOT_REACHED was touched in WebCore::SVGAnimatedType::valueAsString
​https://bugs.webkit.org/show_bug.cgi?id=118744

Reviewed by Philip Rogers.

Source/WebCore:

If we have an <animateTransform> tag that sets the attributeName and attributeType
properties however they are not consistent and we shouldn't try to apply it.
It is already checked and catched in SVGAnimateElement::resetAnimatedType() but
DontApplyAnimation case isn't handled properly. The patch forces an early return
in this case.

Test: svg/animations/attributeNameAndAttributeTypeMissmatch.svg

• svg/SVGAnimateElement.cpp:

(WebCore::SVGAnimateElement::resetAnimatedType):

LayoutTests:

Adding test to check whether attributeName and attributeType are consistent in <animateTransform>.

• platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt: Added.
• svg/animations/attributeNameAndAttributeTypeMissmatch.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt (added)
• LayoutTests/svg/animations/attributeNameAndAttributeTypeMissmatch.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimateElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-29  Renata Hodovan  <reni@webkit.org>
+
+        ASSERT_NOT_REACHED was touched in WebCore::SVGAnimatedType::valueAsString
+        https://bugs.webkit.org/show_bug.cgi?id=118744
+
+        Reviewed by Philip Rogers.
+
+        Adding test to check whether attributeName and attributeType are consistent in <animateTransform>.
+
+        * platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt: Added.
+        * svg/animations/attributeNameAndAttributeTypeMissmatch.svg: Added.
+
 2013-07-29  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-29  Renata Hodovan  <reni@webkit.org>
+
+        ASSERT_NOT_REACHED was touched in WebCore::SVGAnimatedType::valueAsString
+        https://bugs.webkit.org/show_bug.cgi?id=118744
+
+        Reviewed by Philip Rogers.
+
+        If we have an <animateTransform> tag that sets the attributeName and attributeType
+        properties however they are not consistent and we shouldn't try to apply it.
+        It is already checked and catched in SVGAnimateElement::resetAnimatedType() but
+        DontApplyAnimation case isn't handled properly. The patch forces an early return
+        in this case.
+
+        Test: svg/animations/attributeNameAndAttributeTypeMissmatch.svg
+
+        * svg/SVGAnimateElement.cpp:
+        (WebCore::SVGAnimateElement::resetAnimatedType):
+
 2013-07-29  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/svg/SVGAnimateElement.cpp

@@ -206 +206 @@
     const QualifiedName& attributeName = this->attributeName();
     ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName);
+
+    if (shouldApply == DontApplyAnimation)
+        return;
+
     if (shouldApply == ApplyXMLAnimation) {
         // SVG DOM animVal animation code-path.