Rebaseline a couple of tests whose expectations are slightly different than WebKit's due to slight font differences.

BUG=10433
TEST=none

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

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

7 files changed, 292 insertions, 2 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/nested-clearance-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/nested-clearance-expected.checksum
new file mode 100644
index 0000000..be7ed53
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/nested-clearance-expected.checksum
@@ -0,0 +1 @@
+bac637c1d713d1f906db74f9b95e65ec
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/nested-clearance-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/nested-clearance-expected.png
new file mode 100644
index 0000000..777dd56
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/nested-clearance-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.checksum
new file mode 100644
index 0000000..e2eea14
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.checksum
@@ -0,0 +1 @@
+22910e1d740fedc4e70cef0c18b1e682
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.png
new file mode 100644
index 0000000..e4ca696
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.txt
new file mode 100644
index 0000000..2c824eb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/nested-clearance-expected.txt
@@ -0,0 +1,92 @@
+layer at (0,0) size 785x1526
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1526
+  RenderBlock {HTML} at (0,0) size 785x1465
+    RenderBody {BODY} at (8,8) size 769x1449
+      RenderBlock (floating) {DIV} at (0,0) size 64x69
+        RenderImage {IMG} at (0,0) size 64x64
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,69) size 769x1380
+        RenderBlock (floating) {DIV} at (0,0) size 64x69
+          RenderImage {IMG} at (0,0) size 64x64
+          RenderText {#text} at (0,0) size 0x0
+        RenderBlock {DIV} at (0,69) size 769x1311
+          RenderBlock (floating) {DIV} at (0,0) size 64x69
+            RenderImage {IMG} at (0,0) size 64x64
+            RenderText {#text} at (0,0) size 0x0
+          RenderBlock {DIV} at (0,69) size 769x1242
+            RenderBlock (floating) {DIV} at (0,0) size 64x69
+              RenderImage {IMG} at (0,0) size 64x64
+              RenderText {#text} at (0,0) size 0x0
+            RenderBlock {DIV} at (0,69) size 769x1173
+              RenderBlock (floating) {DIV} at (0,0) size 64x69
+                RenderImage {IMG} at (0,0) size 64x64
+                RenderText {#text} at (0,0) size 0x0
+              RenderBlock {DIV} at (0,69) size 769x1104
+                RenderBlock (floating) {DIV} at (0,0) size 64x69
+                  RenderImage {IMG} at (0,0) size 64x64
+                  RenderText {#text} at (0,0) size 0x0
+                RenderBlock {DIV} at (0,69) size 769x1035
+                  RenderBlock (floating) {DIV} at (0,0) size 64x69
+                    RenderImage {IMG} at (0,0) size 64x64
+                    RenderText {#text} at (0,0) size 0x0
+                  RenderBlock {DIV} at (0,69) size 769x966
+                    RenderBlock (floating) {DIV} at (0,0) size 64x69
+                      RenderImage {IMG} at (0,0) size 64x64
+                      RenderText {#text} at (0,0) size 0x0
+                    RenderBlock {DIV} at (0,69) size 769x897
+                      RenderBlock (floating) {DIV} at (0,0) size 64x69
+                        RenderImage {IMG} at (0,0) size 64x64
+                        RenderText {#text} at (0,0) size 0x0
+                      RenderBlock {DIV} at (0,69) size 769x828
+                        RenderBlock (floating) {DIV} at (0,0) size 64x69
+                          RenderImage {IMG} at (0,0) size 64x64
+                          RenderText {#text} at (0,0) size 0x0
+                        RenderBlock {DIV} at (0,69) size 769x759
+                          RenderBlock (floating) {DIV} at (0,0) size 64x69
+                            RenderImage {IMG} at (0,0) size 64x64
+                            RenderText {#text} at (0,0) size 0x0
+                          RenderBlock {DIV} at (0,69) size 769x690
+                            RenderBlock (floating) {DIV} at (0,0) size 64x69
+                              RenderImage {IMG} at (0,0) size 64x64
+                              RenderText {#text} at (0,0) size 0x0
+                            RenderBlock {DIV} at (0,69) size 769x621
+                              RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                RenderImage {IMG} at (0,0) size 64x64
+                                RenderText {#text} at (0,0) size 0x0
+                              RenderBlock {DIV} at (0,69) size 769x552
+                                RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                  RenderImage {IMG} at (0,0) size 64x64
+                                  RenderText {#text} at (0,0) size 0x0
+                                RenderBlock {DIV} at (0,69) size 769x483
+                                  RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                    RenderImage {IMG} at (0,0) size 64x64
+                                    RenderText {#text} at (0,0) size 0x0
+                                  RenderBlock {DIV} at (0,69) size 769x414
+                                    RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                      RenderImage {IMG} at (0,0) size 64x64
+                                      RenderText {#text} at (0,0) size 0x0
+                                    RenderBlock {DIV} at (0,69) size 769x345
+                                      RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                        RenderImage {IMG} at (0,0) size 64x64
+                                        RenderText {#text} at (0,0) size 0x0
+                                      RenderBlock {DIV} at (0,69) size 769x276
+                                        RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                          RenderImage {IMG} at (0,0) size 64x64
+                                          RenderText {#text} at (0,0) size 0x0
+                                        RenderBlock {DIV} at (0,69) size 769x207
+                                          RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                            RenderImage {IMG} at (0,0) size 64x64
+                                            RenderText {#text} at (0,0) size 0x0
+                                          RenderBlock {DIV} at (0,69) size 769x138
+                                            RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                              RenderImage {IMG} at (0,0) size 64x64
+                                              RenderText {#text} at (0,0) size 0x0
+                                            RenderBlock {DIV} at (0,69) size 769x69
+                                              RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                                RenderImage {IMG} at (0,0) size 64x64
+                                                RenderText {#text} at (0,0) size 0x0
+                                              RenderBlock {DIV} at (0,69) size 769x0
+                                                RenderBlock (floating) {DIV} at (0,0) size 64x69
+                                                  RenderImage {IMG} at (0,0) size 64x64
+                                                  RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/webkitConvertPoint-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/webkitConvertPoint-expected.txt
new file mode 100644
index 0000000..18392a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/webkitConvertPoint-expected.txt
@@ -0,0 +1,198 @@
+Test 1 - This is a H1 heading.
+
+Test 2 - This is a simple paragraph.
+
+Test 3 - This is a paragraph with a nested element.
+
+Test 4 - This is a paragraph with a nested element that has a border.
+
+Test 5 - This is a transformed paragraph with a nested element that has a border.
+
+Test 6 - This is a transformed paragraph with a nested element that has a border.
+And then a second line.
+
+Test 7 - This is a paragraph inside something that does not have a compositing layer.
+
+Test 8 - This is raw text inside something that does not have a compositing layer.
+Test 9 - This is raw text inside something that has a compositing layer.
+Test 10 - This is raw text inside something that does not have a compositing layer.
+Test 11 - This is a rotated and scaled paragraph
+
+Test 12 - This is a rotated and scaled paragraph with a nested element that has a border.
+
+Test 13 - This is a paragraph with a nested element that has a border.
+
+This test exercises the webkitConvertPointFromNodeToPage() function
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Test parameter passing - should not crash
+PASS Missing parameter test
+Test did not crash and therefore was successful
+
+PASS null parameter test a
+Test did not crash and therefore was successful
+
+PASS null parameter test b
+Test did not crash and therefore was successful
+
+Test 1
+PASS x is 8
+PASS y is 12
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 13
+PASS y is 52
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 2
+PASS x is 8
+FAIL y should be 50. Was 51.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 13
+FAIL y should be 90. Was 91.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 3
+PASS x is 8
+FAIL y should be 84. Was 87.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 13
+FAIL y should be 124. Was 127.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 4
+PASS x is 8
+FAIL y should be 118. Was 123.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 13
+FAIL y should be 158. Was 163.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 5
+PASS x is 28
+FAIL y should be 152. Was 159.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 33
+FAIL y should be 192. Was 199.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 6
+PASS x is 28
+FAIL y should be 186. Was 195.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 33
+FAIL y should be 226. Was 235.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 7
+PASS x is 8
+FAIL y should be 238. Was 251.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 13
+FAIL y should be 278. Was 291.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 8
+PASS x is 8
+FAIL y should be 272. Was 287.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 13
+FAIL y should be 312. Was 327.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 9
+PASS x is 28
+FAIL y should be 290. Was 307.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 33
+FAIL y should be 330. Was 347.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 10
+PASS x is 28
+FAIL y should be 308. Was 327.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 33
+FAIL y should be 348. Was 367.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 11
+PASS x is 158
+FAIL y should be 355. Was 376.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 174
+FAIL y should be 373. Was 394.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 12
+PASS x is 168
+FAIL y should be 428. Was 451.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 184
+FAIL y should be 446. Was 469.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+Test 13
+PASS x is 28
+FAIL y should be 486. Was 511.
+Round Trip of (0,0)
+PASS x is 0
+PASS y is 0
+PASS x is 33
+FAIL y should be 526. Was 551.
+Round Trip of (5,40)
+PASS x is 5
+PASS y is 40
+
+TEST COMPLETE
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5e42273..2e2f75c 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -821,11 +821,9 @@ BUG10401 : LayoutTests/plugins/npruntime.html = TIMEOUT FAIL
 BUG6735 : LayoutTests/plugins/netscape-throw-exception.html = FAIL
 
 BUG10432 WIN LINUX : LayoutTests/fast/overflow/004.html = FAIL
-BUG10433 WIN LINUX : LayoutTests/fast/dom/Window/webkitConvertPoint.html = FAIL
 
 BUG9071 MAC WIN DEBUG SLOW : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL PASS
 BUG9071 LINUX : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL
-BUG10436 WIN LINUX : LayoutTests/fast/block/float/nested-clearance.html = FAIL
 
 // -----------------------------------------------------------------
 // SVG TESTS