summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 17:47:50 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 17:47:50 +0000
commita8c72ad420e48ee14106cc61340a3ce6064a3c2d (patch)
tree598c8f899b853fae006067e90cdd1659e1e0f4b5
parentafd9193822cdd4e71a79dccd689aca0342b64d22 (diff)
downloadchromium_src-a8c72ad420e48ee14106cc61340a3ce6064a3c2d.zip
chromium_src-a8c72ad420e48ee14106cc61340a3ce6064a3c2d.tar.gz
chromium_src-a8c72ad420e48ee14106cc61340a3ce6064a3c2d.tar.bz2
Rebaseline slider mouse events test (changed upstream http://trac.webkit.org/changeset/45658)
TBR=dglazkov TEST=LayoutTests\fast\forms\slider-mouse-event.html BUG=16289 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23832 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt13
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 11 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt
index eb20630..8fd92b2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/slider-mouse-events-expected.txt
@@ -1,8 +1,17 @@
-This tests that slider controls get mousedown, mousemove, input, and mouseup events.
+This tests that slider controls get mousedown, mousemove, input, and mouseup events and properly set its value.
mousemove
mousedown
+0
mousemove
input
mouseup
-
+36
+mousemove
+mousedown
+input
+4
+mousemove
+input
+mouseup
+21
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a228c64..19d1815 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2462,9 +2462,6 @@ BUG16237 : LayoutTests/http/tests/security/xssAuditor/link-onclick-null-char.htm
BUG16237 : LayoutTests/http/tests/security/xssAuditor/object-embed-tag-null-char.html = FAIL
BUG16237 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-null-char.html = FAIL
-// WebKit merge 45652:45659
-BUG16289 WIN : LayoutTests/fast/forms/slider-mouse-events.html = FAIL
-
// WebKit merge 45659:45664
BUG16355 LINUX : LayoutTests/fast/forms/slider-delete-while-dragging-thumb.html = FAIL