Remove temporary baselines after http://trac.webkit.org/changeset/96470.

* platform/chromium-cg-mac-leopard/svg/custom/grayscale-gradient-mask-2-expected.png: Added.
* platform/chromium-cg-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
* platform/chromium-cg-mac/svg/custom/grayscale-gradient-mask-expected.txt: Removed.
* platform/chromium-linux-x86/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
* platform/chromium-linux-x86/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* platform/chromium-linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
* platform/chromium-linux/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* platform/chromium-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
* platform/chromium-win-vista/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
* platform/chromium-win-vista/svg/css: Removed.
* platform/chromium-win-vista/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* platform/chromium-win-xp/svg/css: Removed.
* platform/chromium-win-xp/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* platform/chromium-win/svg/filters/filter-clip-expected.txt: Removed.
* platform/chromium/svg/filters: Removed.
* platform/chromium/svg/filters/filter-clip-expected.txt: Removed.
* platform/gtk/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* platform/qt/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
* svg/css/circle-in-mask-with-shadow-expected.txt: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96475 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c881b91..b765d98 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,30 @@
 2011-10-02  Adam Barth  <abarth@webkit.org>
 
+        Remove temporary baselines after http://trac.webkit.org/changeset/96470.
+
+        * platform/chromium-cg-mac-leopard/svg/custom/grayscale-gradient-mask-2-expected.png: Added.
+        * platform/chromium-cg-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
+        * platform/chromium-cg-mac/svg/custom/grayscale-gradient-mask-expected.txt: Removed.
+        * platform/chromium-linux-x86/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
+        * platform/chromium-linux-x86/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * platform/chromium-linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
+        * platform/chromium-linux/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * platform/chromium-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
+        * platform/chromium-win-vista/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt: Removed.
+        * platform/chromium-win-vista/svg/css: Removed.
+        * platform/chromium-win-vista/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * platform/chromium-win-xp/svg/css: Removed.
+        * platform/chromium-win-xp/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * platform/chromium-win/svg/filters/filter-clip-expected.txt: Removed.
+        * platform/chromium/svg/filters: Removed.
+        * platform/chromium/svg/filters/filter-clip-expected.txt: Removed.
+        * platform/gtk/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * platform/qt/svg/css/circle-in-mask-with-shadow-expected.txt: Removed.
+        * svg/css/circle-in-mask-with-shadow-expected.txt: Added.
+
+2011-10-02  Adam Barth  <abarth@webkit.org>
+
         Update baseline and expectations after http://trac.webkit.org/changeset/96470
 
         * platform/chromium-cg-mac-leopard/svg/custom/grayscale-gradient-mask-expected.png:

diff --git a/LayoutTests/platform/chromium-cg-mac-leopard/svg/custom/grayscale-gradient-mask-2-expected.png b/LayoutTests/platform/chromium-cg-mac-leopard/svg/custom/grayscale-gradient-mask-2-expected.png
new file mode 100644 (file)
index 0000000..e28d64e
Binary files /dev/null and b/LayoutTests/platform/chromium-cg-mac-leopard/svg/custom/grayscale-gradient-mask-2-expected.png differ

diff --git a/LayoutTests/platform/chromium-cg-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/LayoutTests/platform/chromium-cg-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
deleted file mode 100644 (file)
index a9bd289..0000000
--- a/LayoutTests/platform/chromium-cg-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 360x360
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x360
-  RenderSVGRoot {svg} at (0,45) size 360x270
-    RenderSVGText {text} at (54,18) size 372x22 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 372x22
-        chunk 1 (middle anchor) text run 1 at (54.00,35.00) startOffset 0 endOffset 51 width 372.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceClipper {clipPath} [id="one"] [clipPathUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,78) size 132x84 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=0.00] [width=200.00] [height=200.00]
-      [clipPath="one"] RenderSVGResourceClipper {clipPath} at (155,45) size 175x110
-    RenderSVGText {text} at (50,95) size 110x19 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 110x19
-        chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 109.33: "With a 'clip-path':"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="two"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [fill={[type=SOLID] [color=#0000FF]}] [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,191) size 132x83 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=150.00] [width=200.00] [height=200.00]
-      [masker="two"] RenderSVGResourceMasker {mask} at (155,195) size 175x110
-    RenderSVGText {text} at (50,245) size 88x19 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 88x19
-        chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 88.00: "With a 'mask':"
-    RenderSVGText {text} at (10,303) size 264x47 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 264x47
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.7 $"
-    RenderSVGPath {rect} at (0,45) size 360x270 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]

diff --git a/LayoutTests/platform/chromium-cg-mac/svg/custom/grayscale-gradient-mask-expected.txt b/LayoutTests/platform/chromium-cg-mac/svg/custom/grayscale-gradient-mask-expected.txt
deleted file mode 100644 (file)
index 24dcf9f..0000000
--- a/LayoutTests/platform/chromium-cg-mac/svg/custom/grayscale-gradient-mask-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 360x600
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x600
-  RenderSVGRoot {svg} at (0,229) size 352x133
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceLinearGradient {linearGradient} [id="Gradient"] [gradientUnits=userSpaceOnUse] [start=(0,0)] [end=(800,0)]
-        RenderSVGGradientStop {stop} [offset=0.00] [color=#FFFFFF]
-        RenderSVGGradientStop {stop} [offset=1.00] [color=#000000]
-    RenderSVGResourceMasker {mask} [id="Mask"] [maskUnits=userSpaceOnUse] [maskContentUnits=userSpaceOnUse]
-      RenderSVGPath {rect} at (0,229) size 352x133 [fill={[type=LINEAR-GRADIENT] [id="Gradient"]}] [x=0.00] [y=0.00] [width=800.00] [height=300.00]
-    RenderSVGPath {rect} at (0,229) size 352x133 [fill={[type=SOLID] [color=#FF8080]}] [x=0.00] [y=0.00] [width=800.00] [height=300.00]
-    RenderSVGPath {rect} at (0,273) size 352x45 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=100.00] [width=800.00] [height=100.00]
-      [masker="Mask"] RenderSVGResourceMasker {mask} at (0,0) size 800x300

diff --git a/LayoutTests/platform/chromium-linux-x86/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/LayoutTests/platform/chromium-linux-x86/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
deleted file mode 100644 (file)
index a97644b..0000000
--- a/LayoutTests/platform/chromium-linux-x86/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 360x360
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x360
-  RenderSVGRoot {svg} at (0,45) size 360x270
-    RenderSVGText {text} at (54,17) size 372x22 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 372x22
-        chunk 1 (middle anchor) text run 1 at (54.00,35.00) startOffset 0 endOffset 51 width 372.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceClipper {clipPath} [id="one"] [clipPathUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,78) size 132x84 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=0.00] [width=200.00] [height=200.00]
-      [clipPath="one"] RenderSVGResourceClipper {clipPath} at (155,45) size 175x110
-    RenderSVGText {text} at (50,94) size 115x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 115x20
-        chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 114.67: "With a 'clip-path':"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="two"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [fill={[type=SOLID] [color=#0000FF]}] [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,191) size 132x83 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=150.00] [width=200.00] [height=200.00]
-      [masker="two"] RenderSVGResourceMasker {mask} at (155,195) size 175x110
-    RenderSVGText {text} at (50,244) size 90x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 90x20
-        chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 89.33: "With a 'mask':"
-    RenderSVGText {text} at (10,304) size 259x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 259x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 258.67: "$Revision: 1.7 $"
-    RenderSVGPath {rect} at (0,45) size 360x270 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]

diff --git a/LayoutTests/platform/chromium-linux-x86/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/platform/chromium-linux-x86/svg/css/circle-in-mask-with-shadow-expected.txt
deleted file mode 100644 (file)
index 0e44403..0000000
--- a/LayoutTests/platform/chromium-linux-x86/svg/css/circle-in-mask-with-shadow-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 450x500
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
-          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
-        RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
-        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGPath {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGPath {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
-          RenderSVGContainer {g} at (0,0) size 300x300
-            RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

diff --git a/LayoutTests/platform/chromium-linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/LayoutTests/platform/chromium-linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
deleted file mode 100644 (file)
index a97644b..0000000
--- a/LayoutTests/platform/chromium-linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 360x360
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x360
-  RenderSVGRoot {svg} at (0,45) size 360x270
-    RenderSVGText {text} at (54,17) size 372x22 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 372x22
-        chunk 1 (middle anchor) text run 1 at (54.00,35.00) startOffset 0 endOffset 51 width 372.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceClipper {clipPath} [id="one"] [clipPathUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,78) size 132x84 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=0.00] [width=200.00] [height=200.00]
-      [clipPath="one"] RenderSVGResourceClipper {clipPath} at (155,45) size 175x110
-    RenderSVGText {text} at (50,94) size 115x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 115x20
-        chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 114.67: "With a 'clip-path':"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="two"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [fill={[type=SOLID] [color=#0000FF]}] [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,191) size 132x83 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=150.00] [width=200.00] [height=200.00]
-      [masker="two"] RenderSVGResourceMasker {mask} at (155,195) size 175x110
-    RenderSVGText {text} at (50,244) size 90x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 90x20
-        chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 89.33: "With a 'mask':"
-    RenderSVGText {text} at (10,304) size 259x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 259x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 258.67: "$Revision: 1.7 $"
-    RenderSVGPath {rect} at (0,45) size 360x270 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]

diff --git a/LayoutTests/platform/chromium-linux/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/platform/chromium-linux/svg/css/circle-in-mask-with-shadow-expected.txt
deleted file mode 100644 (file)
index 0e44403..0000000
--- a/LayoutTests/platform/chromium-linux/svg/css/circle-in-mask-with-shadow-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 450x500
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
-          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
-        RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
-        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGPath {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGPath {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
-          RenderSVGContainer {g} at (0,0) size 300x300
-            RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

diff --git a/LayoutTests/platform/chromium-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/LayoutTests/platform/chromium-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
deleted file mode 100644 (file)
index a9bd289..0000000
--- a/LayoutTests/platform/chromium-mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 360x360
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x360
-  RenderSVGRoot {svg} at (0,45) size 360x270
-    RenderSVGText {text} at (54,18) size 372x22 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 372x22
-        chunk 1 (middle anchor) text run 1 at (54.00,35.00) startOffset 0 endOffset 51 width 372.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceClipper {clipPath} [id="one"] [clipPathUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,78) size 132x84 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=0.00] [width=200.00] [height=200.00]
-      [clipPath="one"] RenderSVGResourceClipper {clipPath} at (155,45) size 175x110
-    RenderSVGText {text} at (50,95) size 110x19 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 110x19
-        chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 109.33: "With a 'clip-path':"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="two"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [fill={[type=SOLID] [color=#0000FF]}] [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,191) size 132x83 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=150.00] [width=200.00] [height=200.00]
-      [masker="two"] RenderSVGResourceMasker {mask} at (155,195) size 175x110
-    RenderSVGText {text} at (50,245) size 88x19 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 88x19
-        chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 88.00: "With a 'mask':"
-    RenderSVGText {text} at (10,303) size 264x47 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 264x47
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.7 $"
-    RenderSVGPath {rect} at (0,45) size 360x270 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]

diff --git a/LayoutTests/platform/chromium-win-vista/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt b/LayoutTests/platform/chromium-win-vista/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
deleted file mode 100644 (file)
index a97644b..0000000
--- a/LayoutTests/platform/chromium-win-vista/svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-layer at (0,0) size 360x360
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x360
-  RenderSVGRoot {svg} at (0,45) size 360x270
-    RenderSVGText {text} at (54,17) size 372x22 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 372x22
-        chunk 1 (middle anchor) text run 1 at (54.00,35.00) startOffset 0 endOffset 51 width 372.00: "Testing stroke inclusion for 'clip-path' and 'mask'"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceClipper {clipPath} [id="one"] [clipPathUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,78) size 132x84 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=0.00] [width=200.00] [height=200.00]
-      [clipPath="one"] RenderSVGResourceClipper {clipPath} at (155,45) size 175x110
-    RenderSVGText {text} at (50,94) size 115x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 115x20
-        chunk 1 text run 1 at (50.00,110.00) startOffset 0 endOffset 19 width 114.67: "With a 'clip-path':"
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="two"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
-        RenderSVGPath {circle} at (0,45) size 1x1 [stroke={[type=SOLID] [color=#FF0000] [stroke width=0.15]}] [fill={[type=SOLID] [color=#0000FF]}] [cx=0.30] [cy=0.50] [r=0.20]
-        RenderSVGPath {circle} at (0,45) size 1x1 [fill={[type=SOLID] [color=#0000FF]}] [cx=0.70] [cy=0.50] [r=0.20]
-    RenderSVGPath {rect} at (116,191) size 132x83 [fill={[type=SOLID] [color=#00008B]}] [x=150.00] [y=150.00] [width=200.00] [height=200.00]
-      [masker="two"] RenderSVGResourceMasker {mask} at (155,195) size 175x110
-    RenderSVGText {text} at (50,244) size 90x20 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 90x20
-        chunk 1 text run 1 at (50.00,260.00) startOffset 0 endOffset 14 width 89.33: "With a 'mask':"
-    RenderSVGText {text} at (10,304) size 259x46 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 259x46
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 258.67: "$Revision: 1.7 $"
-    RenderSVGPath {rect} at (0,45) size 360x270 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]

diff --git a/LayoutTests/platform/chromium-win-vista/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/platform/chromium-win-vista/svg/css/circle-in-mask-with-shadow-expected.txt
deleted file mode 100644 (file)
index 0e44403..0000000
--- a/LayoutTests/platform/chromium-win-vista/svg/css/circle-in-mask-with-shadow-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 450x500
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
-          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
-        RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
-        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGPath {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGPath {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
-          RenderSVGContainer {g} at (0,0) size 300x300
-            RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

diff --git a/LayoutTests/platform/chromium-win-xp/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/platform/chromium-win-xp/svg/css/circle-in-mask-with-shadow-expected.txt
deleted file mode 100644 (file)
index 0e44403..0000000
--- a/LayoutTests/platform/chromium-win-xp/svg/css/circle-in-mask-with-shadow-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 450x500
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
-          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
-        RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
-        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGPath {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGPath {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
-          RenderSVGContainer {g} at (0,0) size 300x300
-            RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

diff --git a/LayoutTests/platform/chromium-win/svg/filters/filter-clip-expected.txt b/LayoutTests/platform/chromium-win/svg/filters/filter-clip-expected.txt
deleted file mode 100644 (file)
index e29d76f..0000000
--- a/LayoutTests/platform/chromium-win/svg/filters/filter-clip-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (20,20) size 100x100
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-        RenderSVGPath {rect} at (0,0) size 140x140 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=140.00] [height=140.00]
-        RenderSVGPath {circle} at (30,30) size 80x80 [fill={[type=SOLID] [color=#FFFF00]}] [cx=70.00] [cy=70.00] [r=40.00]
-      RenderSVGResourceFilter {filter} [id="blur"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
-        [feGaussianBlur stdDeviation="10.00, 10.00"]
-          [SourceGraphic]
-      RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
-        RenderSVGPath {circle} at (20,20) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=70.00] [cy=70.00] [r=50.00]
-    RenderSVGPath {rect} at (20,20) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=20.00] [y=20.00] [width=100.00] [height=100.00]
-      [masker="mask"] RenderSVGResourceMasker {mask} at (10,10) size 120x120
-      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (20,20) size 100x100
-      [filter="blur"] RenderSVGResourceFilter {filter} at (0,0) size 140x140

diff --git a/LayoutTests/platform/chromium/svg/filters/filter-clip-expected.txt b/LayoutTests/platform/chromium/svg/filters/filter-clip-expected.txt
deleted file mode 100644 (file)
index e7e2d9e..0000000
--- a/LayoutTests/platform/chromium/svg/filters/filter-clip-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-layer at (0,0) size 360x600
-  RenderView at (0,0) size 360x240
-layer at (0,0) size 360x600
-  RenderSVGRoot {svg} at (20,20) size 100x100
-    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-      RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-        RenderSVGPath {rect} at (0,0) size 140x140 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=140.00] [height=140.00]
-        RenderSVGPath {circle} at (30,30) size 80x80 [fill={[type=SOLID] [color=#FFFF00]}] [cx=70.00] [cy=70.00] [r=40.00]
-      RenderSVGResourceFilter {filter} [id="blur"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
-        [feGaussianBlur stdDeviation="10.00, 10.00"]
-          [SourceGraphic]
-      RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
-        RenderSVGPath {circle} at (20,20) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=70.00] [cy=70.00] [r=50.00]
-    RenderSVGPath {rect} at (20,20) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=20.00] [y=20.00] [width=100.00] [height=100.00]
-      [masker="mask"] RenderSVGResourceMasker {mask} at (10,10) size 120x120
-      [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (20,20) size 100x100
-      [filter="blur"] RenderSVGResourceFilter {filter} at (0,0) size 140x140

diff --git a/LayoutTests/platform/gtk/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/platform/gtk/svg/css/circle-in-mask-with-shadow-expected.txt
deleted file mode 100644 (file)
index 031e25d..0000000
--- a/LayoutTests/platform/gtk/svg/css/circle-in-mask-with-shadow-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
-          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
-        RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
-        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGPath {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGPath {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
-          RenderSVGContainer {g} at (0,0) size 300x300
-            RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

diff --git a/LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt
deleted file mode 100644 (file)
index 031e25d..0000000
--- a/LayoutTests/platform/mac/svg/css/circle-in-mask-with-shadow-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (5,5) size 220x220
-    RenderSVGContainer {g} at (5,5) size 220x220
-      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
-          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
-        RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]
-        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-          RenderSVGPath {circle} at (5,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (5,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=55.00] [cy=165.00] [r=50.00]
-          RenderSVGPath {circle} at (115,5) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=55.00] [r=50.00]
-          RenderSVGPath {circle} at (115,115) size 120x120 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=165.00] [cy=165.00] [r=50.00]
-      RenderSVGContainer {g} at (5,5) size 220x220
-        RenderSVGContainer {use} at (5,5) size 220x220
-          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,5) size 220x220
-          RenderSVGContainer {g} at (0,0) size 300x300
-            RenderSVGPath {rect} at (0,0) size 300x300 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00]

diff --git a/LayoutTests/platform/qt/svg/css/circle-in-mask-with-shadow-expected.txt b/LayoutTests/svg/css/circle-in-mask-with-shadow-expected.txt
similarity index 100%
rename from LayoutTests/platform/qt/svg/css/circle-in-mask-with-shadow-expected.txt
rename to LayoutTests/svg/css/circle-in-mask-with-shadow-expected.txt