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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 20cffe9e0a3756e33ba5023d9719bd40c2f5cb06
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 04:54:22 2010 +0000

    Fix scrolling with mouse wheel in WebKit2 views.  Once
    we coalesce wheel events, we can re-enable this.
    
    Reviewed by Gavin Barraclough.
    
    * platform/mac/ScrollAnimatorMac.mm:
    (WebCore::ScrollAnimatorMac::scroll):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cbb4350..489c5d8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-09  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix scrolling with mouse wheel in WebKit2 views.  Once
+        we coalesce wheel events, we can re-enable this.
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::scroll):
+
 2010-12-09  Abhishek Arya  <inferno at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/WebCore/platform/mac/ScrollAnimatorMac.mm b/WebCore/platform/mac/ScrollAnimatorMac.mm
index 26a8edc..ca71bd3 100644
--- a/WebCore/platform/mac/ScrollAnimatorMac.mm
+++ b/WebCore/platform/mac/ScrollAnimatorMac.mm
@@ -142,6 +142,9 @@ bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranulari
     if (![[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"])
         return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
 
+    if (granularity == ScrollByPixel)
+        return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
+
     float currentPos = orientation == HorizontalScrollbar ? m_currentPosX : m_currentPosY;
     float newPos = std::max<float>(std::min<float>(currentPos + (step * multiplier), static_cast<float>(m_client->scrollSize(orientation))), 0);
     if (currentPos == newPos)

-- 
WebKit Debian packaging