Changeset 153433 in webkit


Ignore:
Timestamp:
Jul 29, 2013 10:45:51 AM (11 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:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r153432 r153433  
     12013-07-29  Renata Hodovan  <reni@webkit.org>
     2
     3        ASSERT_NOT_REACHED was touched in WebCore::SVGAnimatedType::valueAsString
     4        https://bugs.webkit.org/show_bug.cgi?id=118744
     5
     6        Reviewed by Philip Rogers.
     7
     8        Adding test to check whether attributeName and attributeType are consistent in <animateTransform>.
     9
     10        * platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt: Added.
     11        * svg/animations/attributeNameAndAttributeTypeMissmatch.svg: Added.
     12
    1132013-07-29  Mario Sanchez Prada  <mario.prada@samsung.com>
    214
  • trunk/Source/WebCore/ChangeLog

    r153431 r153433  
     12013-07-29  Renata Hodovan  <reni@webkit.org>
     2
     3        ASSERT_NOT_REACHED was touched in WebCore::SVGAnimatedType::valueAsString
     4        https://bugs.webkit.org/show_bug.cgi?id=118744
     5
     6        Reviewed by Philip Rogers.
     7
     8        If we have an <animateTransform> tag that sets the attributeName and attributeType
     9        properties however they are not consistent and we shouldn't try to apply it.
     10        It is already checked and catched in SVGAnimateElement::resetAnimatedType() but
     11        DontApplyAnimation case isn't handled properly. The patch forces an early return
     12        in this case.
     13
     14        Test: svg/animations/attributeNameAndAttributeTypeMissmatch.svg
     15
     16        * svg/SVGAnimateElement.cpp:
     17        (WebCore::SVGAnimateElement::resetAnimatedType):
     18
    1192013-07-29  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    220
  • trunk/Source/WebCore/svg/SVGAnimateElement.cpp

    r148403 r153433  
    206206    const QualifiedName& attributeName = this->attributeName();
    207207    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName);
     208
     209    if (shouldApply == DontApplyAnimation)
     210        return;
     211
    208212    if (shouldApply == ApplyXMLAnimation) {
    209213        // SVG DOM animVal animation code-path.
Note: See TracChangeset for help on using the changeset viewer.