Changeset 55259 in webkit

Timestamp:

Feb 25, 2010 3:02:00 PM (14 years ago)

Author:

krit@webkit.org

Message:

2010-02-25 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Use-element doesn't transform clipPath
​https://bugs.webkit.org/show_bug.cgi?id=35375

If the use element is a child of clipPath, any settings on x, y or transform does not
transform the clipPath it references.
The use-element just misses this transformation in toClipPath.

Test: svg/custom/use-on-clip-path-with-transformation.svg

• platform/graphics/cairo/PathCairo.cpp: Gtk port translated the path to the wrong direction. (WebCore::Path::translate):
• svg/SVGUseElement.cpp: (WebCore::SVGUseElement::toClipPath):

2010-02-25 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

Use-element doesn't transform clipPath
​https://bugs.webkit.org/show_bug.cgi?id=35375

Check if the clipPath gets transformed on setting a transform or translation for use.

• platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.checksum: Added.
• platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.png: Added.
• platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.txt: Added.
• svg/custom/use-on-clip-path-with-transformation.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.png (added)
• LayoutTests/platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.txt (added)
• LayoutTests/svg/custom/use-on-clip-path-with-transformation.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cairo/PathCairo.cpp (modified) (1 diff)
• WebCore/svg/SVGUseElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-02-25  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Use-element doesn't transform clipPath
+        https://bugs.webkit.org/show_bug.cgi?id=35375
+
+        Check if the clipPath gets transformed on setting a transform or translation for use.
+
+        * platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.checksum: Added.
+        * platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.png: Added.
+        * platform/mac/svg/custom/use-on-clip-path-with-transformation-expected.txt: Added.
+        * svg/custom/use-on-clip-path-with-transformation.svg: Added.
+
 2010-02-25  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-25  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Use-element doesn't transform clipPath
+        https://bugs.webkit.org/show_bug.cgi?id=35375
+
+        If the use element is a child of clipPath, any settings on x, y or transform does not
+        transform the clipPath it references.
+        The use-element just misses this transformation in toClipPath.
+
+        Test: svg/custom/use-on-clip-path-with-transformation.svg
+
+        * platform/graphics/cairo/PathCairo.cpp: Gtk port translated the path to the wrong direction.
+        (WebCore::Path::translate):
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::toClipPath):
+
 2010-02-25  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/platform/graphics/cairo/PathCairo.cpp

@@ -90 +90 @@
 {
     cairo_t* cr = platformPath()->m_cr;
-    cairo_translate(cr, p.width(), p.height());
+    cairo_translate(cr, -p.width(), -p.height());
 }
 

trunk/WebCore/svg/SVGUseElement.cpp

@@ -593 +593 @@
             // Spec: Indirect references are an error (14.3.5)
             document()->accessSVGExtensions()->reportError("Not allowed to use indirect reference in <clip-path>");
-        else
-            return static_cast<SVGStyledTransformableElement*>(n)->toClipPath();
+        else {
+            Path clipPath = static_cast<SVGStyledTransformableElement*>(n)->toClipPath();
+            clipPath.translate(FloatSize(x().value(this), y().value(this)));
+            clipPath.transform(animatedLocalTransform());
+            return clipPath;
+        }
     }