Re-baselining some layout tests which fail due to slight difference between the way fonts are laid out.An interesting observation is that the tests themselves do not give the right output. Once rebaselined to fix the layout tests for now, I think we might have to file bugs upstream.

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

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

10 files changed, 61 insertions, 5 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum
new file mode 100644
index 0000000..c1afb3e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum
@@ -0,0 +1 @@
+ecd103b4f0e32503037c7d14147bcbb5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png
new file mode 100644
index 0000000..e5b1bc8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
new file mode 100644
index 0000000..395dffc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x120
+  RenderBlock {HTML} at (0,0) size 800x120
+    RenderBody {BODY} at (8,16) size 784x88
+      RenderBlock {P} at (0,0) size 784x20 [color=#000080]
+        RenderText {#text} at (0,0) size 310x19
+          text run at (0,0) width 310: "The two blocks below should have the same height."
+      RenderTable {TABLE} at (80,36) size 102x52
+        RenderTableSection {TBODY} at (0,0) size 102x52
+          RenderTableRow {TR} at (0,2) size 102x48
+            RenderTableCell {TD} at (2,2) size 48x48 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (4,4) size 40x40 [color=#000080]
+                RenderText {#text} at (0,0) size 40x40
+                  text run at (0,0) width 40: "\x{C9}"
+            RenderTableCell {TD} at (52,2) size 48x48 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (4,4) size 40x40 [border: (40px solid #000080) none]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum
new file mode 100644
index 0000000..39d4b62
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum
@@ -0,0 +1 @@
+d7613923ed1263e4eeed46d9ee86e53a
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png
new file mode 100644
index 0000000..6bbcec5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
new file mode 100644
index 0000000..4139140
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
@@ -0,0 +1,21 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x120
+  RenderBlock {HTML} at (0,0) size 800x120
+    RenderBody {BODY} at (8,16) size 784x96
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 309x19
+          text run at (0,0) width 309: "There should be a solid vertical bar of green below."
+      RenderBlock {DIV} at (0,36) size 784x60 [color=#008000]
+        RenderBlock {DIV} at (0,0) size 784x15
+          RenderText {#text} at (0,0) size 60x15
+            text run at (0,0) width 60: "   X"
+        RenderBlock {DIV} at (45,15) size 739x15
+          RenderText {#text} at (0,0) size 15x15
+            text run at (0,0) width 15: "X"
+        RenderBlock {DIV} at (56,30) size 728x15
+          RenderText {#text} at (0,0) size 15x15
+            text run at (0,0) width 15: "X"
+        RenderBlock {DIV} at (45,45) size 739x15
+          RenderText {#text} at (0,0) size 15x15
+            text run at (0,0) width 15: "X"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.checksum
new file mode 100644
index 0000000..a3fa82b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.checksum
@@ -0,0 +1 @@
+4fa94f6980e2d8c4d4bd5e2c7014dbdd
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.png
new file mode 100644
index 0000000..c78c95a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt
new file mode 100644
index 0000000..c60d1dd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt
@@ -0,0 +1,19 @@
+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 418x19
+          text run at (0,0) width 418: "There should be no red below, just the outline of an empty green box."
+      RenderBlock {DIV} at (0,36) size 360x264 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)]
+        RenderText {#text} at (40,40) size 280x104
+          text run at (40,40) width 280: "xxxx xxxx xxxx"
+          text run at (40,80) width 280: "xxxx xxxx xxxx"
+          text run at (40,124) width 100: "xxxx "
+        RenderImage {IMG} at (130,80) size 100x100 [border: (20px solid #FFFFFF)]
+        RenderText {#text} at (220,124) size 280x100
+          text run at (220,124) width 20: " "
+          text run at (240,124) width 80: "xxxx"
+          text run at (40,164) width 280: "xxxx xxxx xxxx"
+          text run at (40,204) width 280: "xxxx xxxx xxxx"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 34df134..70cd44d 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -893,10 +893,6 @@ WIN : LayoutTests/http/tests/plugins/geturlnotify-from-npp-destroystream.html =
 // way.  Maybe this is just flaky because it's animating faster?
 LayoutTests/animations/big-rotation.html = FAIL PASS
 
-// Windows is probably getting the ex-height incorrect
-WIN : LayoutTests/css2.1/t040302-c61-ex-len-00-b-a.html = FAIL
-WIN : LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag.html = FAIL
-
 // Missing a Georgian font for Linux
 LINUX : LayoutTests/css2.1/t1202-counter-09-b.html = FAIL
 LINUX : LayoutTests/css2.1/t1202-counters-09-b.html = FAIL
@@ -914,7 +910,7 @@ 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 WIN : LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html = FAIL
+LINUX : LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html = FAIL
 
 // Many off-by-one-pixel bits.  Font metrics?
 LINUX : LayoutTests/css2.1/t100801-c544-valgn-03-d-agi.html = FAIL