summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 21:53:19 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 21:53:19 +0000
commit406b916caa489a9b2f81a7530dcee8f9800329ec (patch)
tree4a3a300c8125e6268b0b2681c1bf66ff70be4d5a /webkit
parent877d55dcd3e01d1db858f154a1f369e76b2ebaf2 (diff)
downloadchromium_src-406b916caa489a9b2f81a7530dcee8f9800329ec.zip
chromium_src-406b916caa489a9b2f81a7530dcee8f9800329ec.tar.gz
chromium_src-406b916caa489a9b2f81a7530dcee8f9800329ec.tar.bz2
Rebaseline layout tests due to the upstream patch:
http://trac.webkit.org/changeset/50237 R=joth BUG=none TEST=none Review URL: http://codereview.chromium.org/344037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.pngbin0 -> 12546 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.pngbin0 -> 6420 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.txt26
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.pngbin14134 -> 14125 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
8 files changed, 29 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum
new file mode 100644
index 0000000..f2c8f4f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum
@@ -0,0 +1 @@
+f984a3204d964b556d5f3c2f8fe511e3 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.png
new file mode 100644
index 0000000..787cfe6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum
new file mode 100644
index 0000000..d0abe2f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.checksum
@@ -0,0 +1 @@
+e11d88b6cfe4fbfc7f0fb78ee573c53c \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.png
new file mode 100644
index 0000000..b7bf3ee
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.txt
new file mode 100644
index 0000000..f69363c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/text-input-with-webkit-border-radius-expected.txt
@@ -0,0 +1,26 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x141
+ RenderBlock {HTML} at (0,0) size 800x141
+ RenderBody {BODY} at (8,16) size 784x117
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 285x19
+ text run at (0,0) width 285: "This test checks that text input fields handle the "
+ RenderInline {CODE} at (0,0) size 168x16
+ RenderText {#text} at (285,3) size 168x16
+ text run at (285,3) width 168: "-webkit-border-radius"
+ RenderText {#text} at (453,0) size 285x19
+ text run at (453,0) width 285: " CSS property correctly, or degrade gracefully."
+ RenderBlock {P} at (0,36) size 784x20
+ RenderText {#text} at (0,0) size 579x19
+ text run at (0,0) width 579: "If the test passes, you will see a text entry field containing \"default text\" inside the grey div below."
+ RenderBlock {DIV} at (0,72) size 163x45 [bgcolor=#888888]
+ RenderTextControl {INPUT} at (11,9) size 133x22 [bgcolor=#00FF00] [border: (2px inset #000000)]
+ RenderBlock {DIV} at (3,3) size 127x16
+ RenderBlock {DIV} at (0,2) size 1x11
+ RenderBlock {DIV} at (115,4) size 9x9
+ RenderText {#text} at (0,0) size 0x0
+layer at (23,100) size 114x16
+ RenderBlock {DIV} at (1,0) size 114x16
+ RenderText {#text} at (1,0) size 64x16
+ text run at (1,0) width 64: "default text"
diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.checksum
index de174c4..991e42b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.checksum
@@ -1 +1 @@
-cf2d47389791e5da6dce4ee0ba1e0e78 \ No newline at end of file
+11e725010c53960018bbb757dd181184 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.png b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.png
index f524b3c..1e456db 100644
--- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-selects-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c3aeabc..1a12996 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3123,10 +3123,6 @@ BUG_JORLOW : LayoutTests/http/tests/ssl/referer-303.html = FAIL
BUG_JORLOW MAC : LayoutTests/fast/css/counters/t1204-increment-00-c-o.html = PASS FAIL
BUG_JORLOW MAC : LayoutTests/fast/css/counters/t1204-increment-01-c-o.html = PASS FAIL
-// WebKit roll 50235:50245
-BUG_JOTH LINUX WIN : LayoutTests/fast/css/text-input-with-webkit-border-radius.html = IMAGE+TEXT
-BUG_JORLOW WIN : chrome/fast/forms/basic-selects.html = IMAGE
-
// WebKit roll 50248:50258
BUG26195 : LayoutTests/accessibility/aria-option-role.html = TEXT
BUG26195 LINUX : LayoutTests/fast/forms/select-empty-option-height.html = PASS TIMEOUT