summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 21:04:25 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-23 21:04:25 +0000
commit29558a80cdb155b51b16c902be019233a0883d56 (patch)
tree9da43641bf5f362ab77ade34df4eca66a26d27fb /webkit
parentbd0b74374adf2bdcc7edf528e54b9ee96e2bcf35 (diff)
downloadchromium_src-29558a80cdb155b51b16c902be019233a0883d56.zip
chromium_src-29558a80cdb155b51b16c902be019233a0883d56.tar.gz
chromium_src-29558a80cdb155b51b16c902be019233a0883d56.tar.bz2
Rebaselined following tests introduced in merging 44152-44202:
LayoutTests/fast/dynamic/window-resize-scrollbars-test.html LayoutTests/fast/dynamic/window-scrollbars-test.html BUG=12753 Patch by Min-Yu Huang <minyu.huang@gmail.com> via http://codereview.chromium.org/147003 Review URL: http://codereview.chromium.org/146048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.pngbin0 -> 5676 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt9
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.pngbin0 -> 4918 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt9
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.pngbin0 -> 3610 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt9
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.pngbin0 -> 3313 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt9
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
13 files changed, 40 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum
new file mode 100644
index 0000000..12c868e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum
@@ -0,0 +1 @@
+7caad8e7a202ebc1a3137d176d1236fb \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.png
new file mode 100644
index 0000000..0bd5922
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt
new file mode 100644
index 0000000..bd1486e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 768x600
+ RenderBlock {HTML} at (0,0) size 768x568
+ RenderBody {BODY} at (8,8) size 752x584
+ RenderText {#text} at (0,0) size 460x19
+ text run at (0,0) width 460: "This window should not have scroll bars. If it has scroll bars, try to use them."
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum
new file mode 100644
index 0000000..88151d8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum
@@ -0,0 +1 @@
+b1c24278234a370a7a32723f7a80122f \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.png
new file mode 100644
index 0000000..264d0d1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt
new file mode 100644
index 0000000..3ba3b62
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 245x19
+ text run at (0,0) width 245: "This window should not have scroll bars."
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum
new file mode 100644
index 0000000..57deb17
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.checksum
@@ -0,0 +1 @@
+79ab0e52092b8f49a882d9affda4e518 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.png
new file mode 100644
index 0000000..8d06d5c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt
new file mode 100644
index 0000000..bd1486e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-resize-scrollbars-test-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 768x600
+ RenderBlock {HTML} at (0,0) size 768x568
+ RenderBody {BODY} at (8,8) size 752x584
+ RenderText {#text} at (0,0) size 460x19
+ text run at (0,0) width 460: "This window should not have scroll bars. If it has scroll bars, try to use them."
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum
new file mode 100644
index 0000000..38ec91a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.checksum
@@ -0,0 +1 @@
+850fd2f8aa63c007c36cdf3be1b75dce \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.png
new file mode 100644
index 0000000..2f1af55
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt
new file mode 100644
index 0000000..3ba3b62
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/window-scrollbars-test-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 245x19
+ text run at (0,0) width 245: "This window should not have scroll bars."
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bf5cbd8..e5139a7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2693,10 +2693,6 @@ BUG12361 : LayoutTests/http/tests/cookies/double-quoted-value-with-semi-colon.ht
BUG12477 : LayoutTests/http/tests/local/drag-over-remote-content.html = FAIL
BUG12477 : LayoutTests/http/tests/security/drag-over-remote-content-iframe.html = FAIL
-// WebKit 44152-44202 introduced new tests
-BUG12753 WIN LINUX : LayoutTests/fast/dynamic/window-resize-scrollbars-test.html = FAIL
-BUG12753 WIN LINUX : LayoutTests/fast/dynamic/window-scrollbars-test.html = FAIL
-
// WebKit 44202:44252 introduced new tests
BUG12881 WIN LINUX : LayoutTests/fast/forms/isindex-placeholder.html = FAIL
BUG12881 WIN LINUX : LayoutTests/fast/box-shadow/border-radius-big.html = FAIL