From 43d0c48d288631fe6dc413fa0a0da285942bdc57 Mon Sep 17 00:00:00 2001 From: "kinuko@chromium.org" Date: Thu, 26 Nov 2009 05:12:04 +0000 Subject: Rebaselinine fast/overflow/004.html as the expected results have been updated upstream (bugs.webkit.org/show_bug.cgi?id=31455). BUG=10432 TEST=none Review URL: http://codereview.chromium.org/384042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33176 0039d316-1c4b-4281-b951-d872f2087c98 --- .../LayoutTests/fast/overflow/004-expected.checksum | 2 +- .../LayoutTests/fast/overflow/004-expected.png | Bin 4018 -> 6227 bytes .../LayoutTests/fast/overflow/004-expected.checksum | 2 +- .../LayoutTests/fast/overflow/004-expected.png | Bin 4022 -> 4022 bytes .../LayoutTests/fast/overflow/004-expected.txt | 12 ++++++------ webkit/tools/layout_tests/test_expectations.txt | 2 -- 6 files changed, 8 insertions(+), 10 deletions(-) (limited to 'webkit') diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.checksum index 6aee1d3..26dbf67 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.checksum @@ -1 +1 @@ -21453c209e1f38e0404d8bb37daf6a53 \ No newline at end of file +9e5aab7cf87c18d7beddcbfd8cb94425 \ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.png index 6cc2273..c4fed46 100644 Binary files a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.png and b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/overflow/004-expected.png differ diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.checksum index 64bc7de..e9e507c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.checksum @@ -1 +1 @@ -3bcf7ffcb662757ed912ecdb23e1f859 \ No newline at end of file +a8c5fa85f66a2887e6288fc74acf493e \ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.png index 29bffc0..650fb2c 100644 Binary files a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.png and b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.png differ diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.txt index cd70dbf..15dd3dd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/004-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x538 - RenderBlock {HTML} at (0,0) size 800x538 - RenderBody {BODY} at (8,8) size 784x522 +layer at (0,0) size 800x536 + RenderBlock {HTML} at (0,0) size 800x536 + RenderBody {BODY} at (8,8) size 784x520 RenderBlock (anonymous) at (0,0) size 784x20 RenderText {#text} at (0,0) size 669x19 text run at (0,0) width 669: "The two green blocks below should be identical and should each take up half the width of the browser window." - RenderBlock (floating) {DIV} at (390,20) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)] + RenderBlock (floating) {DIV} at (392,20) size 392x500 [bgcolor=#008000] [border: (1px solid #000000)] RenderText {#text} at (0,0) size 0x0 -layer at (8,28) size 394x502 clip at (9,29) size 392x500 - RenderBlock {DIV} at (0,20) size 394x502 [bgcolor=#008000] [border: (1px solid #000000)] +layer at (8,28) size 392x500 clip at (9,29) size 390x498 + RenderBlock {DIV} at (0,20) size 392x500 [bgcolor=#008000] [border: (1px solid #000000)] diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 653fa36..4db74fa 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -849,8 +849,6 @@ BUG24206 LINUX MAC : LayoutTests/http/tests/navigation/changing-frame-hierarchy- BUG20507 : LayoutTests/http/tests/uri/resolve-encoding-relative.html = FAIL -BUG10432 WIN LINUX : LayoutTests/fast/overflow/004.html = FAIL - //also BUG24863 BUG9071 WIN : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL BUG9071 LINUX : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL -- cgit v1.1