diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 22:21:29 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 22:21:29 +0000 |
| commit | d0173477d9d64ea12e13426df66519de089d8f80 (patch) | |
| tree | 24304e151bb82d86978b7d54e32771775cf81e1b /webkit | |
| parent | 1700a99ad3fed428265e550b79ac333aad8f76ad (diff) | |
| download | chromium_src-d0173477d9d64ea12e13426df66519de089d8f80.zip chromium_src-d0173477d9d64ea12e13426df66519de089d8f80.tar.gz chromium_src-d0173477d9d64ea12e13426df66519de089d8f80.tar.bz2 | |
Modify how test_shell generates continuous mousewheel events. This is the test_shell side of the DRT changes in https://bugs.webkit.org/show_bug.cgi?id=45155 .
BUG=none
TEST=New version of layout test on https://bugs.webkit.org/show_bug.cgi?id=45155 should pass.
Review URL: http://codereview.chromium.org/3329010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/event_sending_controller.cc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index efb45ad..10870b0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -34,3 +34,8 @@ BUGWK45102 : media/media-can-play-mpeg4-video.html = TEXT // Temporary disable test. Will investigate (antonm@chromium.org). BUGANTONM : fast/js/reserved-words-as-property.html = CRASH TEXT + +// Temporarily marked as pass + fail until the fix for +// https://bugs.webkit.org/show_bug.cgi?id=45155 lands and rolls in, at which +// point this can be removed. +BUGPKASTING : fast/events/continuous-platform-wheelevent-in-scrolling-div.html = TEXT PASS
\ No newline at end of file diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index 6a8f5e3..0da81e6 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -967,7 +967,10 @@ void EventSendingController::handleMouseWheel(const CppArgumentList& args, event.wheelTicksY = static_cast<float>(vertical); event.deltaX = event.wheelTicksX; event.deltaY = event.wheelTicksY; - if (!continuous) { + if (continuous) { + event.wheelTicksX /= kScrollbarPixelsPerTick; + event.wheelTicksY /= kScrollbarPixelsPerTick; + } else { event.deltaX *= kScrollbarPixelsPerTick; event.deltaY *= kScrollbarPixelsPerTick; } |