[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 38016ea1082c2713f55e0ea92c9d14c13056e55f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 01:43:51 2010 +0000

    2010-03-02  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Darin Adler.
    
            Remove unnecessary check.
            https://bugs.webkit.org/show_bug.cgi?id=35513
    
            * platform/ScrollView.cpp:
            (WebCore::ScrollView::updateScrollbars):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ada70c0..3e9eddb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-02  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Remove unnecessary check.
+        https://bugs.webkit.org/show_bug.cgi?id=35513
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateScrollbars):
+
 2010-03-02  Darin Fisher  <darin at chromium.org>
 
         Fix chromium build bustage.
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index 630ad12..e52815a 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -448,8 +448,6 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
         int clientHeight = visibleHeight();
         m_verticalScrollbar->setEnabled(contentsHeight() > clientHeight);
         int pageStep = max(max<int>(clientHeight * Scrollbar::minFractionToStepWhenPaging(), clientHeight - Scrollbar::maxOverlapBetweenPages()), 1);
-        if (pageStep < 0)
-            pageStep = clientHeight;
         IntRect oldRect(m_verticalScrollbar->frameRect());
         IntRect vBarRect = IntRect(width() - m_verticalScrollbar->width(), 
                                    0,

-- 
WebKit Debian packaging