summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 09:02:12 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 09:02:12 +0000
commit7ea0a6112b5110feb4b02d22dae6b7d2994d38a7 (patch)
tree17c944831c2b46a24a2d4c95246561a1f5e74e17 /webkit
parentf02deaaddc2a4f6bb66021065e3a5da9f5bacd07 (diff)
downloadchromium_src-7ea0a6112b5110feb4b02d22dae6b7d2994d38a7.zip
chromium_src-7ea0a6112b5110feb4b02d22dae6b7d2994d38a7.tar.gz
chromium_src-7ea0a6112b5110feb4b02d22dae6b7d2994d38a7.tar.bz2
Rebaseline test results for css2.1/t0803-c5505-mrgn-02-c.
We must not see the vertical scrollbar. So, the original expected image was wrong. BUG=9916 TEST=none Review URL: http://codereview.chromium.org/164246 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.pngbin5605 -> 5449 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt9
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.pngbin3856 -> 3586 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt4
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
7 files changed, 13 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
index 6a82986..14666879f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
@@ -1 +1 @@
-95cc0d06c162384a2e05e671678852d8 \ No newline at end of file
+ac737092cccb0a5f1f99544f56ee6999 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
index e2f1a59..8aa6ca8 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
new file mode 100644
index 0000000..e91a8c1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 802x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 802x38
+ RenderBlock {HTML} at (0,0) size 800x36
+ RenderBody {BODY} at (8,-2) size 784x40
+ RenderBlock {P} at (-10,0) size 804x40 [color=#000080]
+ RenderBR {BR} at (0,0) size 0x19
+ RenderText {#text} at (0,20) size 278x19
+ text run at (0,20) width 278: " This page should have a horizontal scroll bar."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
index 21312b8..c5bd02d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
@@ -1 +1 @@
-d87147dba21d3b26309301158ff3e93b \ No newline at end of file
+2794d666155ec33a4352a78d764126c0 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
index 69715a4..159afdc 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
index eb5f9d6..e91a8c1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 802x600
- RenderView at (0,0) size 800x600
+layer at (0,0) size 802x585
+ RenderView at (0,0) size 800x585
layer at (0,0) size 802x38
RenderBlock {HTML} at (0,0) size 800x36
RenderBody {BODY} at (8,-2) size 784x40
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e63681f..e1810b1 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2190,7 +2190,6 @@ BUG9797 WIN DEBUG : LayoutTests/traversal/node-iterator-009.html = CRASH PASS
// Failed in WebKit merge 42287:42324
BUG9916 WIN LINUX : LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html = FAIL
-BUG9916 WIN LINUX : LayoutTests/css2.1/t0803-c5505-mrgn-02-c.html = FAIL
BUG9916 WIN LINUX : LayoutTests/fast/block/float/013.html = FAIL
BUG9916 : LayoutTests/http/tests/xmlhttprequest/set-dangerous-headers.html = FAIL
BUG9916 WIN LINUX : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = FAIL