Changeset 119391 in webkit

Timestamp:

Jun 4, 2012 6:23:16 AM (12 years ago)

Author:

pdr@google.com

Message:

Fix assert in non-scaling strokes in patterns
​https://bugs.webkit.org/show_bug.cgi?id=88198

Source/WebCore:

When calculating the CTM for a rect or path in a pattern we need to use
an SVGPatternElement's local transform. Pattern did not expose the transform
because it does not extend from from SVGStyledLocatable or SVGStyledTransformable.
This patch exposes the pattern's transform in localCoordinateSpaceTransform.

SVGGradientElement does not need this special handling because the children
of a gradient element are restricted to not include shape and structural elements
that would need to calculate a CTM.

Before this patch the added test would assert.
This patch is a prerequisite to a major refactoring of RenderSVGShape &
friends, and the test will be unskipped in a followup patch.

Reviewed by Dirk Schulze.

Tests: svg/stroke/non-scaling-stroke-pattern-expected.svg

svg/stroke/non-scaling-stroke-pattern.svg

• svg/SVGPatternElement.cpp:

(WebCore::SVGPatternElement::localCoordinateSpaceTransform):
(WebCore):

• svg/SVGPatternElement.h:

(SVGPatternElement):

• svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::localCoordinateSpaceTransform):

LayoutTests:

Reviewed by Dirk Schulze.

• platform/chromium/TestExpectations:
• platform/mac/TestExpectations:
• svg/stroke/non-scaling-stroke-pattern-expected.svg: Added.
• svg/stroke/non-scaling-stroke-pattern.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/svg/stroke/non-scaling-stroke-pattern-expected.svg (added)
• LayoutTests/svg/stroke/non-scaling-stroke-pattern.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGPatternElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGPatternElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGStyledElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-04  Philip Rogers  <pdr@google.com>
+
+        Fix assert in non-scaling strokes in patterns
+        https://bugs.webkit.org/show_bug.cgi?id=88198
+
+        Reviewed by Dirk Schulze.
+
+        * platform/chromium/TestExpectations:
+        * platform/mac/TestExpectations:
+        * svg/stroke/non-scaling-stroke-pattern-expected.svg: Added.
+        * svg/stroke/non-scaling-stroke-pattern.svg: Added.
+
 2012-06-04  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -1228 +1228 @@
 BUGWK81243 : svg/repaint/repainting-after-animation-element-removal.svg = PASS IMAGE
 
+BUGWK88198 : svg/stroke/non-scaling-stroke-pattern.svg = PASS IMAGE
+
 BUGWK81493 LINUX : svg/custom/js-late-gradient-creation.svg = PASS IMAGE
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -200 +200 @@
 BUGWK85401 : media/video-colorspace-yuv422.html = TEXT
 
+BUGWK88198 : svg/stroke/non-scaling-stroke-pattern.svg = PASS IMAGE
+
 BUGWK85404 : fast/loader/javascript-url-in-embed.html = TEXT PASS
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-04  Philip Rogers  <pdr@google.com>
+
+        Fix assert in non-scaling strokes in patterns
+        https://bugs.webkit.org/show_bug.cgi?id=88198
+
+        When calculating the CTM for a rect or path in a pattern we need to use
+        an SVGPatternElement's local transform. Pattern did not expose the transform
+        because it does not extend from from SVGStyledLocatable or SVGStyledTransformable.
+        This patch exposes the pattern's transform in localCoordinateSpaceTransform.
+
+        SVGGradientElement does not need this special handling because the children
+        of a gradient element are restricted to not include shape and structural elements
+        that would need to calculate a CTM.
+
+        Before this patch the added test would assert.
+        This patch is a prerequisite to a major refactoring of RenderSVGShape &
+        friends, and the test will be unskipped in a followup patch.
+
+        Reviewed by Dirk Schulze.
+
+        Tests: svg/stroke/non-scaling-stroke-pattern-expected.svg
+               svg/stroke/non-scaling-stroke-pattern.svg
+
+        * svg/SVGPatternElement.cpp:
+        (WebCore::SVGPatternElement::localCoordinateSpaceTransform):
+        (WebCore):
+        * svg/SVGPatternElement.h:
+        (SVGPatternElement):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::localCoordinateSpaceTransform):
+
 2012-06-04  Alexei Filippov  <alexeif@chromium.org>
 

trunk/Source/WebCore/svg/SVGPatternElement.cpp

@@ -243 +243 @@
 }
 
+AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
+{
+    AffineTransform matrix;
+    patternTransform().concatenate(matrix);
+    return matrix;
+}
+
 bool SVGPatternElement::selfHasRelativeLengths() const
 {

trunk/Source/WebCore/svg/SVGPatternElement.h

@@ -52 +52 @@
     void collectPatternAttributes(PatternAttributes&) const;
 
+    virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const;
+
 private:
     SVGPatternElement(const QualifiedName&, Document*);

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -451 +451 @@
 AffineTransform SVGStyledElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
 {
-    // To be overriden by SVGStyledLocatableElement/SVGStyledTransformableElement (or as special case SVGTextElement)
+    // To be overriden by SVGStyledLocatableElement/SVGStyledTransformableElement (or as special case SVGTextElement and SVGPatternElement)
     ASSERT_NOT_REACHED();
     return AffineTransform();