[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[senorblanco at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 736a45b0ea7fd9d318494066539c3b80cb292f33
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 00:52:25 2010 +0000

    2010-02-04  Stephen White  <senorblanco at chromium.org>
    
            Unreviewed, build fix.
    
            Fix for Chromium/Mac after palindromic scrollbar change (54345).
    
            Covered by many layout tests.
    
            * platform/chromium/ScrollbarThemeChromiumMac.h:
            (WebCore::ScrollbarThemeChromiumMac::maxOverlapBetweenPages):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9afcfb9..4dfc6f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-04  Stephen White  <senorblanco at chromium.org>
+
+        Unreviewed, build fix.
+
+        Fix for Chromium/Mac after palindromic scrollbar change (54345).
+
+        Covered by many layout tests.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.h:
+        (WebCore::ScrollbarThemeChromiumMac::maxOverlapBetweenPages):
+
 2010-02-04  Clemmitt Sigler  <cmsigler at gmail.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
index 1ab2f18..cc1a9c9 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
@@ -61,6 +61,8 @@ protected:
     virtual IntRect forwardButtonRect(Scrollbar*, ScrollbarPart, bool painting = false);
     virtual IntRect trackRect(Scrollbar*, bool painting = false);
 
+    virtual int maxOverlapBetweenPages() { return 40; }
+
     virtual int minimumThumbLength(Scrollbar*);
 
     virtual bool shouldCenterOnThumb(Scrollbar*, const PlatformMouseEvent&);

-- 
WebKit Debian packaging