Merge 88396 - 2011-06-08 Sailesh Agrawal <sail@chromium.org>

Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h

Index: Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h
===================================================================
--- Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h	(revision 88459)
+++ Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.h	(working copy)
@@ -27,6 +27,7 @@
 #ifndef ScrollbarThemeChromiumMac_h
 #define ScrollbarThemeChromiumMac_h
 
+#include "ScrollbarOverlayUtilitiesChromiumMac.h"
 #include "ScrollbarThemeComposite.h"
 
 // This file (and its associated .mm file) is a clone of ScrollbarThemeMac.h.
@@ -44,6 +45,7 @@
     virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar);
 
     virtual bool supportsControlTints() const { return true; }
+    virtual bool usesOverlayScrollbars() const;
 
     virtual double initialAutoscrollTimerDelay();
     virtual double autoscrollTimerDelay();
@@ -53,6 +55,9 @@
     virtual void registerScrollbar(Scrollbar*);
     virtual void unregisterScrollbar(Scrollbar*);
 
+    void setNewPainterForScrollbar(Scrollbar*, WKScrollbarPainterRef);
+    WKScrollbarPainterRef painterForScrollbar(Scrollbar*);
+
 protected:
     virtual bool hasButtons(Scrollbar*);
     virtual bool hasThumb(Scrollbar*);
@@ -64,6 +69,7 @@
     virtual int minimumThumbLength(Scrollbar*);
 
     virtual bool shouldCenterOnThumb(Scrollbar*, const PlatformMouseEvent&);
+    virtual bool shouldDragDocumentInsteadOfThumb(Scrollbar*, const PlatformMouseEvent&);
 
 public:
     void preferencesChanged();