[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 7682f2977eac9f678ca9132b61fc73272560b6b9
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 01:49:47 2010 +0000

    Fix failing Mac tests.
    
    * platform/mac/ScrollAnimatorMac.mm:
    (WebCore::ScrollAnimatorMac::scroll): Don't smooth scroll if the default
    AppleScrollAnimationEnabled is false.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f8fff71..f354583 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-09  Sam Weinig  <sam at webkit.org>
+
+        Fix failing Mac tests.
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::scroll): Don't smooth scroll if the default
+        AppleScrollAnimationEnabled is false.
+
 2010-12-09  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/mac/ScrollAnimatorMac.mm b/WebCore/platform/mac/ScrollAnimatorMac.mm
index c8aec8c..26a8edc 100644
--- a/WebCore/platform/mac/ScrollAnimatorMac.mm
+++ b/WebCore/platform/mac/ScrollAnimatorMac.mm
@@ -137,8 +137,11 @@ ScrollAnimatorMac::~ScrollAnimatorMac()
 {
 }
 
-bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float multiplier)
+bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier)
 {
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"])
+        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