summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-09 15:46:05 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-09 15:46:05 +0000
commit33c1d279a502d0f6a78870bfa2c0465b7ecdd307 (patch)
tree61deebea80bfbee6b918f8bedc1f12cc9de83295
parente2ac7000e32f351ec6026060c489514f397dcb9d (diff)
downloadchromium_src-33c1d279a502d0f6a78870bfa2c0465b7ecdd307.zip
chromium_src-33c1d279a502d0f6a78870bfa2c0465b7ecdd307.tar.gz
chromium_src-33c1d279a502d0f6a78870bfa2c0465b7ecdd307.tar.bz2
Rebaseline password-placeholder after upstream changes.
This matches changes made in webkit in r37217 and r37123. The input element text had changed from our old expected results. I am assuming this is from Eric's removal of the layout tests hacks. Review URL: http://codereview.chromium.org/13664 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6586 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.pngbin3037 -> 3020 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.txt10
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt1
4 files changed, 6 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.checksum
index cb6ddd1..eca25b1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.checksum
@@ -1 +1 @@
-5395bcc9a29236d7e5105afe7923232e \ No newline at end of file
+f69f4b4c68311ef6e16d6baa88bbeb18 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.png
index 0d42f06..d779827 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.txt
index 1498718..6059cd2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/password-placeholder-expected.txt
@@ -3,9 +3,9 @@ layer 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
- RenderTextControl {INPUT} at (0,0) size 110x20 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
-layer at (10,11) size 106x14
- RenderBlock {DIV} at (2,3) size 106x14 [color=#808080]
- RenderText {#text} at (1,0) size 30x14
- text run at (1,0) width 30: "foobar"
+layer at (10,11) size 151x16
+ RenderBlock {DIV} at (2,3) size 151x16 [color=#A9A9A9]
+ RenderText {#text} at (1,0) size 35x16
+ text run at (1,0) width 35: "foobar"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 673ebc2..e774ef35 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1074,7 +1074,6 @@ LINUX WIN : LayoutTests/fast/css/variables/shorthand-test.html = FAIL
LayoutTests/fast/css/variables/variable-iteration-test.html = FAIL
LINUX WIN : LayoutTests/fast/forms/8250.html = FAIL
LayoutTests/fast/forms/input-disabled-color.html = FAIL
-LayoutTests/fast/forms/password-placeholder.html = FAIL
LayoutTests/fast/forms/selection-functions.html = FAIL
LayoutTests/fast/js/number-toString.html = FAIL
LayoutTests/fast/js/numeric-conversion.html = FAIL