Rebaseline some layout tests. The only difference between the expected and the actual are the fonts layout. These are again those tests where the expectations are lies.

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

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

11 files changed, 83 insertions, 8 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag-expected.checksum
new file mode 100644
index 0000000..9bbf51f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag-expected.checksum
@@ -0,0 +1 @@
+80a47ed14f887d58cfea70797d12277e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png
new file mode 100644
index 0000000..9d5a991
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
new file mode 100644
index 0000000..90f5b86
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
@@ -0,0 +1 @@
+d5682de794e9f47d37be8808cce86405
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
new file mode 100644
index 0000000..3160bde
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
new file mode 100644
index 0000000..cdad61e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
@@ -0,0 +1,38 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x300
+  RenderBlock {HTML} at (0,0) size 800x300
+    RenderBody {BODY} at (8,16) size 784x276
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 359x19
+          text run at (0,0) width 359: "There should be a tall solid unbroken column of blue below."
+      RenderBlock {DIV} at (0,36) size 432x24 [color=#0000FF]
+        RenderText {#text} at (0,0) size 48x24
+          text run at (0,0) width 48: " x"
+      RenderBlock {DIV} at (0,60) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,84) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,108) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,132) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,156) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,180) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,204) size 432x24 [color=#0000FF]
+        RenderText {#text} at (30,0) size 24x24
+          text run at (30,0) width 24: "x"
+      RenderBlock {DIV} at (0,228) size 432x24 [color=#0000FF]
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
+      RenderBlock {DIV} at (0,252) size 432x24 [color=#0000FF]
+        RenderText {#text} at (0,0) size 48x24
+          text run at (0,0) width 48: " x"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum
new file mode 100644
index 0000000..b42ebca
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum
@@ -0,0 +1 @@
+f307ddc078b07b87a7a50c9854ca339e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png
new file mode 100644
index 0000000..8db5591
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
new file mode 100644
index 0000000..c176615
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
@@ -0,0 +1,41 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x324
+  RenderBlock {HTML} at (0,0) size 800x324
+    RenderBody {BODY} at (8,16) size 784x300
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 676x19
+          text run at (0,0) width 676: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
+      RenderBlock {DIV} at (0,36) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x  xx  xxx  xxxx"
+      RenderBlock {DIV} at (0,60) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x  xx  xxx  xxxx"
+      RenderBlock {DIV} at (0,84) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x  xx  xxx  xxxx"
+      RenderBlock {DIV} at (0,108) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,132) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,156) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,180) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,204) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,228) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,252) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 402x24
+          text run at (0,0) width 402: "x xx xxx xxxx"
+      RenderBlock {DIV} at (0,276) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {#text} at (0,0) size 384x24
+          text run at (0,0) width 384: "x xx xxx xxxx"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum
new file mode 100644
index 0000000..23cd3e1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum
@@ -0,0 +1 @@
+a71cab14121827b588d65e626cfee493
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png
new file mode 100644
index 0000000..d8564b3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index fe5026e..684c26e9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -893,12 +893,6 @@ LINUX : LayoutTests/css2.1/t1202-counters-09-b.html = FAIL
 // x-height correct and we're still one px off.
 LINUX : LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html = FAIL
 
-// This needs to be rebased on Windows since the baseline was incorrect.
-WIN : LayoutTests/css2.1/t1601-c547-indent-00-b-a.html = FAIL
-
-// Font metrics problems on Windows
-WIN : LayoutTests/css2.1/t1604-c541-word-sp-00-b-a.html = FAIL
-
 // Uses ahem font and expects line heights to match some pixel value.
 // We should be able to pass this -- not sure what's wrong.
 LINUX : LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html = FAIL
@@ -915,9 +909,7 @@ LINUX WIN : LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag.html = FAIL
 LINUX : LayoutTests/editing/pasteboard/copy-standalone-image.html = FAIL
 
 // Some tests that we had baselined improperly on Windows.
-WIN : LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag.html = FAIL
 WIN : LayoutTests/css2.1/t1507-c526-font-sz-02-b-a.html = FAIL
-WIN : LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a.html = FAIL
 
 // Linux: color off by one.  Rounding error?
 LINUX : LayoutTests/editing/deleting/deletionUI-single-instance.html = FAIL