Changeset 122616 in webkit

Timestamp:

Jul 13, 2012 12:08:31 PM (12 years ago)

Author:

pdr@google.com

Message:

Remove assert in localCoordinateSpaceTransform()
​https://bugs.webkit.org/show_bug.cgi?id=91189

Reviewed by Nikolas Zimmermann.

Source/WebCore:

The assert in localCoordinateSpaceTransform was added to catch subclasses forgetting
to override the method but it is better to simply return the identity matrix.

This scenario can occur when we break the SVG content model, such as asking for
the CTM of a <g> element inside a <tspan>. This is undefined in the spec because
tspan is not a subclass of SVGLocatable but both Firefox and Opera
implement this by returning the identity matrix.

Test: svg/custom/invalid-ctm.svg

• svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::localCoordinateSpaceTransform):

LayoutTests:

• svg/custom/invalid-ctm-expected.txt: Added.
• svg/custom/invalid-ctm.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/invalid-ctm-expected.txt (added)
• LayoutTests/svg/custom/invalid-ctm.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGStyledElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-13  Philip Rogers  <pdr@google.com>
+
+        Remove assert in localCoordinateSpaceTransform()
+        https://bugs.webkit.org/show_bug.cgi?id=91189
+
+        Reviewed by Nikolas Zimmermann.
+
+        * svg/custom/invalid-ctm-expected.txt: Added.
+        * svg/custom/invalid-ctm.svg: Added.
+
 2012-07-13  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-13  Philip Rogers  <pdr@google.com>
+
+        Remove assert in localCoordinateSpaceTransform()
+        https://bugs.webkit.org/show_bug.cgi?id=91189
+
+        Reviewed by Nikolas Zimmermann.
+
+        The assert in localCoordinateSpaceTransform was added to catch subclasses forgetting
+        to override the method but it is better to simply return the identity matrix.
+
+        This scenario can occur when we break the SVG content model, such as asking for
+        the CTM of a <g> element inside a <tspan>. This is undefined in the spec because
+        tspan is not a subclass of SVGLocatable but both Firefox and Opera
+        implement this by returning the identity matrix.
+
+        Test: svg/custom/invalid-ctm.svg
+
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::localCoordinateSpaceTransform):
+
 2012-07-13  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -452 +452 @@
 {
     // To be overriden by SVGStyledLocatableElement/SVGStyledTransformableElement (or as special case SVGTextElement and SVGPatternElement)
-    ASSERT_NOT_REACHED();
     return AffineTransform();
 }