[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 2a3ea47222cb5cc961a39fee7a777dfb2de032e4
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 03:29:45 2010 +0000

    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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b6e2300..d8acab5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-08  David Hyatt  <hyatt at 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 at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index b02562b..ca9e336 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -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());

-- 
WebKit Debian packaging