Commit 2a3ea472 authored by hyatt@apple.com's avatar hyatt@apple.com
Browse files

Fix regression from xji's wheel scroll patch. The vertical case is looking at the horizontal

maximum position and not the vertical position.

Reviewed by Simon Fraser.

* platform/ScrollView.cpp:
(WebCore::ScrollView::wheelEvent):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5c20f2f3
2010-12-08 David Hyatt <hyatt@apple.com>
Reviewed by Simon Fraser.
Fix regression from xji's wheel scroll patch. The vertical case is looking at the horizontal
maximum position and not the vertical position.
* platform/ScrollView.cpp:
(WebCore::ScrollView::wheelEvent):
2010-12-08 Sam Weinig <sam@webkit.org>
Reviewed by Darin Adler.
......
......@@ -738,7 +738,7 @@ void ScrollView::wheelEvent(PlatformWheelEvent& e)
if ((deltaX < 0 && maxForwardScrollDelta.width() > 0)
|| (deltaX > 0 && maxBackwardScrollDelta.width() >0)
|| (deltaY < 0 && maxForwardScrollDelta.height() > 0)
|| (deltaY > 0 && maxBackwardScrollDelta.width() > 0)) {
|| (deltaY > 0 && maxBackwardScrollDelta.height() > 0)) {
e.accept();
if (e.granularity() == ScrollByPageWheelEvent) {
ASSERT(!e.deltaX());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment