Title: [153433] trunk
- Revision
- 153433
- Author
- [email protected]
- Date
- 2013-07-29 10:45:51 -0700 (Mon, 29 Jul 2013)
Log 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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (153432 => 153433)
--- trunk/LayoutTests/ChangeLog 2013-07-29 17:16:25 UTC (rev 153432)
+++ trunk/LayoutTests/ChangeLog 2013-07-29 17:45:51 UTC (rev 153433)
@@ -1,3 +1,15 @@
+2013-07-29 Renata Hodovan <[email protected]>
+
+ 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 <[email protected]>
[ATK] Implement allAttributes() for AccessibilityUIElement
Added: trunk/LayoutTests/platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt (0 => 153433)
--- trunk/LayoutTests/platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/qt/svg/animations/attributeNameAndAttributeTypeMissmatch-expected.txt 2013-07-29 17:45:51 UTC (rev 153433)
@@ -0,0 +1,7 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (10,5) size 243x19
+ RenderSVGText {text} at (10,5) size 243x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 243x19
+ chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 42 width 243.00: "Test passes if it does not crash in debug."
Added: trunk/LayoutTests/svg/animations/attributeNameAndAttributeTypeMissmatch.svg (0 => 153433)
--- trunk/LayoutTests/svg/animations/attributeNameAndAttributeTypeMissmatch.svg (rev 0)
+++ trunk/LayoutTests/svg/animations/attributeNameAndAttributeTypeMissmatch.svg 2013-07-29 17:45:51 UTC (rev 153433)
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+ <animateTransform attributeName="transform" attributeType="CSS"></animateTransform>
+ <text x="10" y="20">Test passes if it does not crash in debug.</text>
+</svg>
Modified: trunk/Source/WebCore/ChangeLog (153432 => 153433)
--- trunk/Source/WebCore/ChangeLog 2013-07-29 17:16:25 UTC (rev 153432)
+++ trunk/Source/WebCore/ChangeLog 2013-07-29 17:45:51 UTC (rev 153433)
@@ -1,3 +1,21 @@
+2013-07-29 Renata Hodovan <[email protected]>
+
+ 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 <[email protected]>
REGRESSION(148300) GIFs not reanimated after resumeActiveDOMObjectAndAnimations
Modified: trunk/Source/WebCore/svg/SVGAnimateElement.cpp (153432 => 153433)
--- trunk/Source/WebCore/svg/SVGAnimateElement.cpp 2013-07-29 17:16:25 UTC (rev 153432)
+++ trunk/Source/WebCore/svg/SVGAnimateElement.cpp 2013-07-29 17:45:51 UTC (rev 153433)
@@ -205,6 +205,10 @@
SVGElement* targetElement = this->targetElement();
const QualifiedName& attributeName = this->attributeName();
ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName);
+
+ if (shouldApply == DontApplyAnimation)
+ return;
+
if (shouldApply == ApplyXMLAnimation) {
// SVG DOM animVal animation code-path.
m_animatedProperties = animator->findAnimatedPropertiesForAttributeName(targetElement, attributeName);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes