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

[pkasting at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8f57969e3cf29ec5625a4d91d671544d26658c35
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 01:50:59 2010 +0000

    Not reviewed, rollback.
    
    Rollback r54387, it doesn't fix builds and Chromium doesn't want this behavior.
    
    * platform/chromium/ScrollbarThemeChromiumMac.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54392 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4dfc6f6..85d4a09 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-04  Peter Kasting  <pkasting at google.com>
+
+        Not reviewed, rollback.
+
+        Rollback r54387, it doesn't fix builds and Chromium doesn't want this behavior.
+
+        * platform/chromium/ScrollbarThemeChromiumMac.h:
+
 2010-02-04  Stephen White  <senorblanco at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
index cc1a9c9..1ab2f18 100644
--- a/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
+++ b/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
@@ -61,8 +61,6 @@ 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