Unreviewed, rolling out r126169.
[WebKit-https.git] / Source / WebCore / platform / ScrollAnimator.h
index 2b38944..0c5f32c 100644 (file)
 #ifndef ScrollAnimator_h
 #define ScrollAnimator_h
 
+#include "PlatformWheelEvent.h"
 #include "ScrollTypes.h"
 #include <wtf/Forward.h>
 
 namespace WebCore {
 
 class FloatPoint;
-class PlatformWheelEvent;
 class ScrollableArea;
 class Scrollbar;
 
-#if ENABLE(GESTURE_EVENTS)
-class PlatformGestureEvent;
-#endif
-
 class ScrollAnimator {
 public:
     static PassOwnPtr<ScrollAnimator> create(ScrollableArea*);
@@ -65,10 +61,15 @@ public:
 
     virtual bool handleWheelEvent(const PlatformWheelEvent&);
 
+#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+    virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
+#endif
+
     void setCurrentPosition(const FloatPoint&);
     FloatPoint currentPosition() const;
 
     virtual void cancelAnimations() { }
+    virtual void serviceScrollAnimations() { }
 
     virtual void contentAreaWillPaint() const { }
     virtual void mouseEnteredContentArea() const { }
@@ -91,8 +92,10 @@ public:
 
     virtual void notifyContentAreaScrolled() { }
 
+    virtual bool isRubberBandInProgress() const { return false; }
+
 protected:
-    ScrollAnimator(ScrollableArea*);
+    explicit ScrollAnimator(ScrollableArea*);
 
     virtual void notifyPositionChanged();