Blink Support for Overlay Scrollbar Animation

Source/platform/scroll/ScrollableArea.h

 /*
  * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class FloatPoint;
 class GraphicsContext;
 class GraphicsLayer;
 class PlatformGestureEvent;
 class PlatformWheelEvent;
 class ScrollAnimator;
+class ScrollbarStateTransitionAnimator;
 
 enum ScrollBehavior {
     ScrollBehaviorAuto,
     ScrollBehaviorInstant,
     ScrollBehaviorSmooth,
 };
 
 enum IncludeScrollbarsInRect {
     ExcludeScrollbars,
     IncludeScrollbars,
@@ skipping 41 matching lines @@
     void contentAreaDidShow() const;
     void contentAreaDidHide() const;
 
     void finishCurrentScrollAnimations() const;
 
     virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation);
     virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation);
 
     virtual void contentsResized();
 
-    bool hasOverlayScrollbars() const;
+    virtual bool hasOverlayScrollbars() const;
     void setScrollbarOverlayStyle(ScrollbarOverlayStyle);
     ScrollbarOverlayStyle scrollbarOverlayStyle() const { return static_cast<ScrollbarOverlayStyle>(m_scrollbarOverlayStyle); }
 
     // This getter will create a ScrollAnimator if it doesn't already exist.
     ScrollAnimator* scrollAnimator() const;
 
     // This getter will return null if the ScrollAnimator hasn't been created yet.
     ScrollAnimator* existingScrollAnimator() const { return m_scrollAnimator.get(); }
 
+    // This getter will create a ScrollbarStateTransitionAnimator if needed and doesn't already exist.
+    ScrollbarStateTransitionAnimator* scrollbarStateTransitionAnimator() const;
+    // This getter will return null if the ScrollbarStateTransitionAnimator hasn't been created yet.
+    ScrollbarStateTransitionAnimator* existingScrollbarStateTransitionAnimator() const
+    {
+        return m_scrollbarStateTransitionAnimator.get();
+    }
+
+    bool isDuringStateTransitionAnimation() const;
+    void stateTransitionInProgress();
+
     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
     bool scrollOriginChanged() const { return m_scrollOriginChanged; }
 
     // FIXME(bokan): Meaningless name, rename to isActiveFocus
     virtual bool isActive() const = 0;
     virtual int scrollSize(ScrollbarOrientation) const = 0;
     virtual void invalidateScrollbar(Scrollbar*, const IntRect&);
     virtual bool isScrollCornerVisible() const = 0;
     virtual IntRect scrollCornerRect() const = 0;
     virtual void invalidateScrollCorner(const IntRect&);
@@ skipping 48 matching lines @@
     virtual bool scrollAnimatorEnabled() const { return false; }
 
     // NOTE: Only called from Internals for testing.
     void setScrollOffsetFromInternals(const IntPoint&);
 
     IntPoint clampScrollPosition(const IntPoint&) const;
 
     // Let subclasses provide a way of asking for and servicing scroll
     // animations.
     virtual bool scheduleAnimation() { return false; }
-    void serviceScrollAnimations();
+    void serviceScrollbarAnimations();
 
     virtual bool usesCompositedScrolling() const { return false; }
 
     virtual void updateAfterCompositingChange() { }
 
     virtual bool userInputScrollable(ScrollbarOrientation) const = 0;
     virtual bool shouldPlaceVerticalScrollbarOnLeft() const = 0;
 
     // Convenience functions
     int scrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? scrollPosition().x() : scrollPosition().y(); }
@@ skipping 57 matching lines @@
     // This function should be overriden by subclasses to perform the actual
     // scroll of the content.
     virtual void setScrollOffset(const IntPoint&) = 0;
 
     virtual int lineStep(ScrollbarOrientation) const;
     virtual int pageStep(ScrollbarOrientation) const;
     virtual int documentStep(ScrollbarOrientation) const;
     virtual float pixelStep(ScrollbarOrientation) const;
 
     mutable OwnPtr<ScrollAnimator> m_scrollAnimator;
+    mutable OwnPtr<ScrollbarStateTransitionAnimator> m_scrollbarStateTransitionAnimator;
     unsigned m_constrainsScrollingToContentEdge : 1;
 
     unsigned m_inLiveResize : 1;
 
     unsigned m_verticalScrollElasticity : 2; // ScrollElasticity
     unsigned m_horizontalScrollElasticity : 2; // ScrollElasticity
 
     unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
 
     unsigned m_scrollOriginChanged : 1;
 
     // There are 8 possible combinations of writing mode and direction. Scroll origin will be non-zero in the x or y axis
     // if there is any reversed direction or writing-mode. The combinations are:
     // writing-mode / direction     scrollOrigin.x() set    scrollOrigin.y() set
     // horizontal-tb / ltr          NO                      NO
     // horizontal-tb / rtl          YES                     NO
     // horizontal-bt / ltr          NO                      YES
     // horizontal-bt / rtl          YES                     YES
     // vertical-lr / ltr            NO                      NO
     // vertical-lr / rtl            NO                      YES
     // vertical-rl / ltr            YES                     NO
     // vertical-rl / rtl            YES                     YES
     IntPoint m_scrollOrigin;
 };
 
 } // namespace WebCore
 
 #endif // ScrollableArea_h