Tweak bug number, rebaseline a old test. Yay improvements to test_shell!

TBR=senorblanco
TEST=none
BUG=24198

Review URL: http://codereview.chromium.org/543080

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36368 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 94 insertions, 18 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.checksum
index a5bab08..eb9a637 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.checksum
@@ -1 +1 @@
-b45aabdea959a8b2c6e689f413c6a519
\ No newline at end of file
+9a6ea7e13ac0f62afd60ec6ed302a3ff
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.png
index e3c01a7..cdb6ce9 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/clip-path-referencing-use2-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
new file mode 100644
index 0000000..9953c8d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
@@ -0,0 +1,46 @@
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+KCanvasResource {id="clip" [type=CLIPPER] [clip data=[[winding=EVEN-ODD] [path=M0.00,0.00 L0.00,0.00 L0.00,0.00 L0.00,0.00 Z]]]}
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (0,0) size 598x144
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+      RenderSVGContainer {use} at (0,0) size 50x50
+        RenderSVGContainer {g} at (0,0) size 50x50
+          RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGContainer {use} at (0,0) size 50x50
+          RenderSVGContainer {g} at (0,0) size 50x50
+            RenderSVGContainer {g} at (0,0) size 50x50
+              RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+    RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
+    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="clip"]
+      RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
+    RenderSVGText {text} at (10,120) size 377x18 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-14) size 377x18
+        chunk 1 text run 1 at (10.00,120.00) startOffset 0 endOffset 56 width 377.00: "The graphic above should show a 100x100 green rectangle."
+    RenderSVGText {text} at (10,140) size 588x18 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-14) size 588x18
+        chunk 1 text run 1 at (10.00,140.00) startOffset 0 endOffset 96 width 588.00: "The red rectangle should not show since it uses a clipping path that uses an indirect reference."
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
new file mode 100644
index 0000000..ec3161c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/clip-path-referencing-use2-expected.txt
@@ -0,0 +1,46 @@
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+KCanvasResource {id="clip" [type=CLIPPER] [clip data=[[winding=EVEN-ODD] [path=M0.00,0.00 L0.00,0.00 L0.00,0.00 L0.00,0.00 Z]]]}
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (0,0) size 569x144
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+      RenderSVGContainer {use} at (0,0) size 50x50
+        RenderSVGContainer {g} at (0,0) size 50x50
+          RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+      RenderSVGHiddenContainer {clipPath} at (0,0) size 0x0
+        RenderSVGContainer {use} at (0,0) size 50x50
+          RenderSVGContainer {g} at (0,0) size 50x50
+            RenderSVGContainer {g} at (0,0) size 50x50
+              RenderPath {rect} at (0,0) size 50x50 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+    RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
+    RenderSVGContainer {g} at (0,0) size 100x100 [clip path="clip"]
+      RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
+    RenderSVGText {text} at (10,120) size 360x19 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-15) size 360x19
+        chunk 1 text run 1 at (10.00,120.00) startOffset 0 endOffset 56 width 360.00: "The graphic above should show a 100x100 green rectangle."
+    RenderSVGText {text} at (10,140) size 559x19 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-15) size 559x19
+        chunk 1 text run 1 at (10.00,140.00) startOffset 0 endOffset 96 width 559.00: "The red rectangle should not show since it uses a clipping path that uses an indirect reference."
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
+CONSOLE MESSAGE: line 1: Error: Not allowed to use indirect reference in <clip-path>
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 96fdad4..6eb416b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -975,9 +975,8 @@ BUG10298 LINUX : svg/custom/use-on-disallowed-foreign-object-3.svg = FAIL
 // to differing implementations of SVG fonts. They may or may not represent
 // real bugs which need fixin'
 
-// pixeltest failure: font baseline should be on the path, not the centerline
 // There's no baseline at all for this!
-BUG24198 SKIP : svg/batik/text/smallFonts.svg = FAIL
+BUG32392 SKIP : svg/batik/text/smallFonts.svg = FAIL
 
 // pixeltest failure: font baseline should be on the path, not the centerline
 BUG24198 LINUX WIN : svg/custom/path-textPath-simulation.svg = FAIL
@@ -1000,21 +999,6 @@ BUG24198 LINUX WIN : svg/hixie/text/003.html = FAIL
 // SVG combined with font metrics.
 BUG24198 LINUX : svg/hixie/text/001-broken.xml = FAIL
 
-// This is an interesting one.
-// The test has an error which causes it to output a message to the console.
-// Apple's expected results include this error. Actually, Apple's expected
-// results include the error twice, because (apparently unique among console
-// debugging messages) it's generated during rendering. The problem is that
-// we end up invoking the renderer twice when we're doing pixel tests, once
-// otherwise, so we get different results depending on whether pixel tests are
-// enabled. (Neither matches Apple's exactly... when we have pixel tests on,
-// the duplicate error message ends up at the end of the file, while Apple's
-// results have them both at the top.) But this test doesn't represent a real
-// failure in any way and nothing needs to be done to fix it. I'm leaving it
-// in tests_fixable in case we change the test shell's webview delegate to
-// ignore console messages while doing a pixel dump
-BUG24198 : svg/custom/clip-path-referencing-use2.svg = FAIL
-
 // These two tests have a highlight color that is different from the Mac,
 // which is normal because selection color is different between Mac and
 // Windows, but even so it still doesn't look identical because there is still