Rebaseline a couple of tests that are OK, and add a few comments on the test_expectations for some others.

BUG=8635,10281,10435,10463
TEST=none
Review URL: http://codereview.chromium.org/164455

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

11 files changed, 14 insertions, 13 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.checksum
index 59ca787..f047cf3 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.checksum
@@ -1 +1 @@
-15181ae778c3724db651e983199377d0
\ No newline at end of file
+2e69a93086e9b128e55c34b71dda03b5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.png
index 70e95b5..07c3dab 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/scrollbar-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.checksum
index 2fc6ccf..03370ee 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.checksum
@@ -1 +1 @@
-c36f38beec65a96809a11aa2b6d015e0
\ No newline at end of file
+0193bf40a30abfdf34716c7544751697
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.png
index 9ca09d4..1611a69 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/carto.net/selectionlist-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.checksum
index f60f2f2..821f6a8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.checksum
@@ -1 +1 @@
-2457bbddfed046e77c678d52d7c3c1c2
\ No newline at end of file
+71a24c49cc601d2cba8ce0486e697946
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.png
index 539d351..c6669a1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.txt
index 8abbc664..dc7912e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/scrollbar-expected.txt
@@ -11,7 +11,7 @@ layer at (0,0) size 800x600
         chunk 1 (end anchor) text run 1 at (566.00,30.00) startOffset 0 endOffset 59 width 384.00: "One can also drag the images and the scrollbars will adopt."
     RenderSVGViewportContainer {svg} at (40,60) size 2885.60x336.40
       RenderSVGContainer {g} at (40,60) size 2885.60x336.40
-        RenderImage {image} at (0,0) size 3607x420
+        RenderSVGImage {image} at (40,60) size 2885.60x336.40
         RenderSVGContainer {g} at (370.40,112) size 1626.40x260
           RenderSVGText {text} at (413,88) size 86x18 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-14) size 86x18
@@ -60,7 +60,7 @@ layer at (0,0) size 800x600
         chunk 1 (end anchor) text run 1 at (429.00,280.00) startOffset 0 endOffset 89 width 521.00: "Panorama Zervreilastausee, Vals, Graub\x{FC}nden, Switzerland, taken 2006-02-04 (\x{A9} A. Neumann)"
     RenderSVGViewportContainer {svg} at (40,300) size 2848.60x551.20
       RenderSVGContainer {g} at (40,300) size 2848.60x551.20
-        RenderImage {image} at (0,0) size 3560x689
+        RenderSVGImage {image} at (40,300) size 2848.60x551.20
     RenderSVGContainer {g} at (40,300) size 728.80x168.80
       RenderSVGContainer {g} at (40,460) size 720x8.80
         RenderPath {rect} at (40,460) size 704x8.80 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F5F5F5]}] [data="M50.50,550.50 L929.50,550.50 L929.50,560.50 L50.50,560.50 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.checksum
index 4e504ab..b4308b1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.checksum
@@ -1 +1 @@
-4be8609e7184e8867cab146e6c73ec6e
\ No newline at end of file
+f859257c52b920b9cad3ab2ef86da713
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.png
index 04c5b42..3b28365 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.txt
index 0ef5dc5..073cbe9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/carto.net/selectionlist-expected.txt
@@ -48,7 +48,7 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (765,112) size 90x14 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-11) size 90x14
           chunk 1 text run 1 at (765.00,112.00) startOffset 0 endOffset 18 width 90.00: "This is selnumber2"
-    RenderImage {image} at (0,0) size 410x307
+    RenderSVGImage {image} at (39.06,117.19) size 320.31x239.84
     RenderSVGContainer {g} at (471.11,237.56) size 312.39x213.74 [transform={m=((0.87,0.50)(-0.50,0.87)) t=(550.00,20.00)}]
       RenderSVGText {text} at (220,212) size 419x74 contains 4 chunk(s)
         RenderSVGInlineText {#text} at (0,-11) size 197x14
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1039a25..5f0be22 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -768,19 +768,21 @@ BUG8696 WIN LINUX : LayoutTests/fast/gradients/crash-on-zero-radius.html = FAIL
 BUG8635 LINUX WIN : LayoutTests/svg/custom/pattern-y-offset.svg = FAIL
 BUG8635 LINUX WIN : LayoutTests/svg/batik/paints/patternRegions.svg = FAIL
 BUG8635 LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/masking-mask-01-b.svg = FAIL
-BUG8635 LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t.svg = FAIL
 BUG8635 LINUX WIN : LayoutTests/svg/custom/pattern-cycle-detection.svg = FAIL
 
+// Shows garbage instead of an image
+BUG8635 LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/struct-use-01-t.svg = FAIL
+
 BUG5641 LINUX WIN : LayoutTests/svg/batik/text/textEffect.svg = FAIL
 BUG5641 LINUX WIN : LayoutTests/svg/batik/text/textEffect3.svg = FAIL
 
 BUG8763 LINUX WIN : LayoutTests/svg/custom/use-on-g-containing-foreignObject-and-image.svg = FAIL
 
-BUG10281 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b.svg = FAIL
-
 // smiley.png should be shown with xml:base and xml:base on parent.
 BUG10281 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/struct-image-07-t.svg = FAIL
 
+// Not showing images when they should be
+BUG10281 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b.svg = FAIL
 BUG10281 WIN LINUX : LayoutTests/svg/W3C-SVG-1.1/struct-symbol-01-b.svg = FAIL
 
 // Radial gradients with offset focal points are not implemented in Skia.
@@ -1816,7 +1818,7 @@ BUG10434 LINUX : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = FAIL
 // Regression from merge 41268:41286
 // We don't render linear gradient on text stroke.
 BUG10435 LINUX : LayoutTests/fast/canvas/canvas-text-alignment.html = FAIL
-BUG10435 LINUX : LayoutTests/svg/carto.net/scrollbar.svg = TIMEOUT FAIL
+BUG10435 LINUX : LayoutTests/svg/carto.net/scrollbar.svg = TIMEOUT PASS
 BUG10435 MAC : LayoutTests/editing/pasteboard/copy-standalone-image.html = FAIL
 // See above comment about this test on linux/win.
 BUG10435 MAC : LayoutTests/editing/selection/designmode-no-caret.html = FAIL
@@ -1942,8 +1944,7 @@ BUG10463 WIN LINUX : LayoutTests/editing/selection/hit-test-anonymous.html = FAI
 BUG10463 WIN LINUX : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
 BUG10463 WIN LINUX : LayoutTests/fast/forms/slider-zoomed.html = FAIL CRASH
 BUG10463 WIN : LayoutTests/svg/W3C-SVG-1.1/animate-elem-36-t.svg = FAIL
-SLOW BUG10463 WIN : LayoutTests/svg/carto.net/scrollbar.svg = FAIL
-BUG10463 WIN LINUX : LayoutTests/svg/carto.net/selectionlist.svg = CRASH FAIL
+BUG10463 WIN LINUX : LayoutTests/svg/carto.net/selectionlist.svg = CRASH PASS
 BUG10463 WIN : LayoutTests/svg/custom/focus-ring.svg = FAIL
 BUG10463 WIN : LayoutTests/svg/custom/image-parent-translation.xhtml = FAIL
 BUG10463 WIN LINUX : LayoutTests/svg/custom/js-update-image.svg = FAIL