Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

1 files changed, 14 insertions, 7 deletions

diff --git a/WebCore/platform/ScrollbarClient.h b/WebCore/platform/ScrollbarClient.h
index fa94ecc..ab3b10e 100644
--- a/WebCore/platform/ScrollbarClient.h
+++ b/WebCore/platform/ScrollbarClient.h
@@ -26,21 +26,28 @@
 #ifndef ScrollbarClient_h
 #define ScrollbarClient_h
 
+#include "IntPoint.h"
 #include "IntRect.h"
 #include "Scrollbar.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
+class ScrollAnimator;
+
 class ScrollbarClient {
 public:
-    virtual ~ScrollbarClient() { }
-    virtual void valueChanged(Scrollbar*) = 0;
+    ScrollbarClient();
+    virtual ~ScrollbarClient();
 
-    virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
+    bool scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier);
+    void setScrollPositionAndStopAnimation(ScrollbarOrientation orientation, float pos);
 
+    virtual int scrollSize(ScrollbarOrientation orientation) const = 0;
+    virtual void setScrollOffsetFromAnimation(const IntPoint&) = 0;
+    virtual void valueChanged(Scrollbar*) = 0;
+    virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
     virtual bool isActive() const = 0;
-    
     virtual bool scrollbarCornerPresent() const = 0;
 
     virtual void getTickmarks(Vector<IntRect>&) const { }
@@ -52,21 +59,21 @@ public:
     {
         return scrollbar->Widget::convertToContainingView(scrollbarRect);
     }
-    
     virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
     {
         return scrollbar->Widget::convertFromContainingView(parentRect);
     }
-    
     virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
     {
         return scrollbar->Widget::convertToContainingView(scrollbarPoint);
     }
-    
     virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
     {
         return scrollbar->Widget::convertFromContainingView(parentPoint);
     }
+
+private:
+    OwnPtr<ScrollAnimator> m_scrollAnimator;
 };
 
 }