diff options
Diffstat (limited to 'Source/WebCore/platform/mac/ScrollAnimatorMac.h')
| -rw-r--r-- | Source/WebCore/platform/mac/ScrollAnimatorMac.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Source/WebCore/platform/mac/ScrollAnimatorMac.h b/Source/WebCore/platform/mac/ScrollAnimatorMac.h index 2bafbf5..f7b6332 100644 --- a/Source/WebCore/platform/mac/ScrollAnimatorMac.h +++ b/Source/WebCore/platform/mac/ScrollAnimatorMac.h @@ -30,7 +30,6 @@ #include "FloatPoint.h" #include "FloatSize.h" -#include "HeaderDetection.h" #include "ScrollAnimator.h" #include "Timer.h" #include "WebCoreSystemInterface.h" @@ -67,6 +66,8 @@ public: #endif #endif + virtual void cancelAnimations(); + void immediateScrollToPoint(const FloatPoint& newPosition); void immediateScrollByDeltaX(float deltaX); void immediateScrollByDeltaY(float deltaY); @@ -74,14 +75,25 @@ public: void setIsDrawingIntoLayer(bool b) { m_drawingIntoLayer = b; } bool isDrawingIntoLayer() const { return m_drawingIntoLayer; } + bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; } + +#if USE(WK_SCROLLBAR_PAINTER) + bool scrollbarPaintTimerIsActive() const; + void startScrollbarPaintTimer(); + void stopScrollbarPaintTimer(); +#endif + private: RetainPtr<id> m_scrollAnimationHelper; RetainPtr<ScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate; -#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER) +#if USE(WK_SCROLLBAR_PAINTER) RetainPtr<WKScrollbarPainterControllerRef> m_scrollbarPainterController; RetainPtr<ScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate; RetainPtr<id> m_scrollbarPainterDelegate; + + void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*); + Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer; #endif virtual void notityPositionChanged(); @@ -131,6 +143,7 @@ private: Timer<ScrollAnimatorMac> m_snapRubberBandTimer; #endif bool m_drawingIntoLayer; + bool m_haveScrolledSincePageLoad; }; } // namespace WebCore |