[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:52:29 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit cb0def29ce8989bd9f39009f2f2ec5a76cde4dc9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 30 21:24:46 2009 +0000
2009-12-30 Dirk Schulze <krit at webkit.org>
Reviewed by Anders Carlsson.
svg/custom/use-on-symbol-inside-pattern.svg is failing
https://bugs.webkit.org/show_bug.cgi?id=17393
Reenable the test. It isn't failing anymore.
* platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.checksum:
* platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png:
* platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt:
* svg/custom/use-on-symbol-inside-pattern.svg: Copied from LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg-disabled.
* svg/custom/use-on-symbol-inside-pattern.svg-disabled: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52671 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5637cca..5ca47e9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,20 @@
2009-12-30 Dirk Schulze <krit at webkit.org>
+ Reviewed by Anders Carlsson.
+
+ svg/custom/use-on-symbol-inside-pattern.svg is failing
+ https://bugs.webkit.org/show_bug.cgi?id=17393
+
+ Reenable the test. It isn't failing anymore.
+
+ * platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.checksum:
+ * platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png:
+ * platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt:
+ * svg/custom/use-on-symbol-inside-pattern.svg: Copied from LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg-disabled.
+ * svg/custom/use-on-symbol-inside-pattern.svg-disabled: Removed.
+
+2009-12-30 Dirk Schulze <krit at webkit.org>
+
Reviewed by Eric Seidel.
SVGResourceClipper needs to invalidate content
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.checksum b/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.checksum
index 8d397e0..3ae60ac 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.checksum
+++ b/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.checksum
@@ -1 +1 @@
-5f8afc2f329305590000caa9ff9dc7c9
\ No newline at end of file
+ec0222132384b7fb5d289246bc0f3194
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png b/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png
index 4da00de..f7d95e3 100644
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt
index 32bbe4c..2e31af8 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt
@@ -9,31 +9,31 @@ layer at (0,0) size 225x425
RenderSVGContainer {use} at (2.50,3.75) size 15x22.50 [transform={m=((0.75,0.00)(0.00,0.75)) t=(10.00,15.00)}]
RenderSVGContainer {g} at (2.50,3.75) size 15x22.50
RenderSVGViewportContainer {svg} at (2.50,3.75) size 15x22.50
- RenderPath {path} at (9.25,3.75) size 1.50x22.50 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-15.00L0.00,15.00"]
- RenderPath {path} at (9.25,3.75) size 4.50x3.38 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-15.00C0.00,-12.67,1.67,-11.50,5.00,-11.50"]
- RenderPath {path} at (6.25,3.75) size 4.50x3.38 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-15.00C0.00,-12.67,-1.67,-11.50,-5.00,-11.50"]
- RenderPath {path} at (9.25,8.25) size 6.75x5.25 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-9.00C0.00,-5.00,2.67,-3.00,8.00,-3.00"]
- RenderPath {path} at (4,8.25) size 6.75x5.25 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-9.00C0.00,-5.00,-2.67,-3.00,-8.00,-3.00"]
- RenderPath {path} at (9.25,15) size 8.25x6 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,0.00C0.00,4.67,3.33,7.00,10.00,7.00"]
- RenderPath {path} at (2.50,15) size 8.25x6 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,0.00C0.00,4.67,-3.33,7.00,-10.00,7.00"]
+ RenderPath {path} at (9.25,3.75) size 1.50x22.50 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-15.00 L0.00,15.00"]
+ RenderPath {path} at (9.25,3.75) size 4.50x3.38 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-15.00 C0.00,-12.67,1.67,-11.50,5.00,-11.50"]
+ RenderPath {path} at (6.25,3.75) size 4.50x3.38 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-15.00 C0.00,-12.67,-1.67,-11.50,-5.00,-11.50"]
+ RenderPath {path} at (9.25,8.25) size 6.75x5.25 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-9.00 C0.00,-5.00,2.67,-3.00,8.00,-3.00"]
+ RenderPath {path} at (4,8.25) size 6.75x5.25 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,-9.00 C0.00,-5.00,-2.67,-3.00,-8.00,-3.00"]
+ RenderPath {path} at (9.25,15) size 8.25x6 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,0.00 C0.00,4.67,3.33,7.00,10.00,7.00"]
+ RenderPath {path} at (2.50,15) size 8.25x6 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,0.00 C0.00,4.67,-3.33,7.00,-10.00,7.00"]
RenderSVGContainer {pattern} at (8.94,11.56) size 12.13x15.94
RenderSVGContainer {use} at (8.94,11.56) size 12.13x15.94 [transform={m=((0.50,0.00)(0.00,0.50)) t=(15.00,20.00)}]
RenderSVGContainer {g} at (8.94,11.56) size 12.13x15.94
RenderSVGViewportContainer {svg} at (8.94,11.56) size 12.13x15.94
- RenderPath {path} at (14.50,22.50) size 1x5 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,15.00L0.00,5.00"]
- RenderPath {path} at (8.94,11.56) size 12.13x12.76 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,5.00C-1.94,7.10,-5.09,7.54,-7.53,6.05C-9.97,4.56,-11.03,1.56,-10.05,-1.13C-9.07,-3.81,-6.33,-5.43,-3.50,-5.00C-5.62,-6.52,-6.51,-9.23,-5.71,-11.71C-4.91,-14.19,-2.61,-15.87,-0.00,-15.87C2.61,-15.87,4.91,-14.19,5.71,-11.71C6.51,-9.23,5.62,-6.52,3.50,-5.00C6.33,-5.43,9.07,-3.81,10.05,-1.13C11.03,1.56,9.97,4.56,7.53,6.05C5.09,7.54,1.94,7.10,-0.00,5.00"]
- RenderPath {path} at (-1.85,-1.05) size 203.87x92.12 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,50.00L100.00,0.00L200.00,20.00L150.00,70.00L50.00,90.00"]
+ RenderPath {path} at (14.50,22.50) size 1x5 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,15.00 L0.00,5.00"]
+ RenderPath {path} at (8.94,11.56) size 12.13x12.76 [stroke={[type=SOLID] [color=#008000] [stroke width=2.00]}] [data="M0.00,5.00 C-1.94,7.10,-5.09,7.54,-7.53,6.05 C-9.97,4.56,-11.03,1.56,-10.05,-1.13 C-9.07,-3.81,-6.33,-5.43,-3.50,-5.00 C-5.62,-6.52,-6.51,-9.23,-5.71,-11.71 C-4.91,-14.19,-2.61,-15.87,-0.00,-15.87 C2.61,-15.87,4.91,-14.19,5.71,-11.71 C6.51,-9.23,5.62,-6.52,3.50,-5.00 C6.33,-5.43,9.07,-3.81,10.05,-1.13 C11.03,1.56,9.97,4.56,7.53,6.05 C5.09,7.54,1.94,7.10,0.00,5.00 Z"]
+ RenderPath {path} at (-1.85,-1.05) size 203.87x92.12 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 Z"]
RenderSVGContainer {g} at (8.15,6) size 203.87x95.07 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
RenderSVGText {text} at (0,10) size 66x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-14) size 66x18
chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 10 width 66.00: "coniferous"
RenderSVGContainer {use} at (8.15,8.95) size 203.87x92.12
RenderSVGContainer {g} at (8.15,8.95) size 203.87x92.12
- RenderPath {path} at (8.15,8.95) size 203.87x92.12 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (0,0) size 1x1]}] [data="M0.00,50.00L100.00,0.00L200.00,20.00L150.00,70.00L50.00,90.00"]
+ RenderPath {path} at (8.15,8.95) size 203.87x92.12 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (0,0) size 1x1]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 Z"]
RenderSVGContainer {g} at (8.15,106) size 203.87x95.07 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,110.00)}]
RenderSVGText {text} at (0,10) size 75x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-14) size 75x18
chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 10 width 75.00: "broadLeave"
RenderSVGContainer {use} at (8.15,108.95) size 203.87x92.12
RenderSVGContainer {g} at (8.15,108.95) size 203.87x92.12
- RenderPath {path} at (8.15,108.95) size 203.87x92.12 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (0,0) size 1x1]}] [data="M0.00,50.00L100.00,0.00L200.00,20.00L150.00,70.00L50.00,90.00"]
+ RenderPath {path} at (8.15,108.95) size 203.87x92.12 [stroke={[type=SOLID] [color=#B42D25] [stroke width=2.00]}] [fill={[type=PATTERN] [bbox=at (0,0) size 1x1]}] [data="M0.00,50.00 L100.00,0.00 L200.00,20.00 L150.00,70.00 L50.00,90.00 Z"]
diff --git a/LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg b/LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg
new file mode 100644
index 0000000..2532b60
--- /dev/null
+++ b/LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg
@@ -0,0 +1,36 @@
+<!-- georg held -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="225" height="425">
+ <title>pattern</title>
+ <defs>
+ <symbol id="coniferous" overflow="visible" style="fill:none;stroke:green;stroke-width:2">
+ <path d="M0 -15 l0 30"/>
+ <path d="M0 -15 q0 3.5 5 3.5"/>
+ <path d="M0 -15 q0 3.5 -5 3.5"/>
+ <path d="M0 -9 q0 6 8 6"/>
+ <path d="M0 -9 q0 6 -8 6"/>
+ <path d="M0 0 q0 7 10 7"/>
+ <path d="M0 0 q0 7 -10 7"/>
+ </symbol>
+ <symbol id="broadLeave" overflow="visible" style="fill:none;stroke:green;stroke-width:2;">
+ <path d="M0 15 l0 -10"/>
+ <path d="M0 5 a6 6 0 1 1 -3.5 -10 a6 6 0 1 1 7 0 a6 6 0 1 1 -3.5 10z"/>
+ </symbol>
+
+ <pattern id="pat00" patternUnits="userSpaceOnUse" width="30" height="45">
+ <use xlink:href="#coniferous" transform="translate(10,15) scale(0.75)"/>
+ </pattern>
+ <pattern id="pat01" patternUnits="userSpaceOnUse" width="30" height="45">
+ <use xlink:href="#broadLeave" transform="translate(15,20) scale(0.5)"/>
+ </pattern>
+
+ <path id="geometry" style="fill-rule:nonzero;stroke:#B42D25;stroke-width:2;" d="M0 50 l100 -50 100 20 -50 50 -100 20z"/>
+ </defs>
+ <g transform="translate(10,10)">
+ <text x="0" y="10">coniferous</text>
+ <use xlink:href="#geometry" style="fill:url(#pat00)"/>
+ </g>
+ <g transform="translate(10,110)">
+ <text x="0" y="10">broadLeave</text>
+ <use xlink:href="#geometry" style="fill:url(#pat01)"/>
+ </g>
+</svg>
diff --git a/LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg-disabled b/LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg-disabled
deleted file mode 100644
index ca5ce89..0000000
--- a/LayoutTests/svg/custom/use-on-symbol-inside-pattern.svg-disabled
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- georg held -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/SVG/DTD/svg10.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="225" height="425">
- <title>pattern</title>
- <defs>
- <symbol id="coniferous" overflow="visible" style="fill:none;stroke:green;stroke-width:2">
- <path d="M0 -15 l0 30"/>
- <path d="M0 -15 q0 3.5 5 3.5"/>
- <path d="M0 -15 q0 3.5 -5 3.5"/>
- <path d="M0 -9 q0 6 8 6"/>
- <path d="M0 -9 q0 6 -8 6"/>
- <path d="M0 0 q0 7 10 7"/>
- <path d="M0 0 q0 7 -10 7"/>
- </symbol>
- <symbol id="broadLeave" overflow="visible" style="fill:none;stroke:green;stroke-width:2;">
- <path d="M0 15 l0 -10"/>
- <path d="M0 5 a6 6 0 1 1 -3.5 -10 a6 6 0 1 1 7 0 a6 6 0 1 1 -3.5 10z"/>
- </symbol>
-
- <pattern id="pat00" patternUnits="userSpaceOnUse" width="30" height="45">
- <use xlink:href="#coniferous" transform="translate(10,15) scale(0.75)"/>
- </pattern>
- <pattern id="pat01" patternUnits="userSpaceOnUse" width="30" height="45">
- <use xlink:href="#broadLeave" transform="translate(15,20) scale(0.5)"/>
- </pattern>
-
- <path id="geometry" style="fill-rule:nonzero;stroke:#B42D25;stroke-width:2;" d="M0 50 l100 -50 100 20 -50 50 -100 20z"/>
- </defs>
- <g transform="translate(10,10)">
- <text x="0" y="10">coniferous</text>
- <use xlink:href="#geometry" style="fill:url(#pat00)"/>
- </g>
- <g transform="translate(10,110)">
- <text x="0" y="10">broadLeave</text>
- <use xlink:href="#geometry" style="fill:url(#pat01)"/>
- </g>
-</svg>
\ No newline at end of file
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list