OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 | 49 |
50 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimatorBase { | 50 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimatorBase { |
51 USING_PRE_FINALIZER(ScrollAnimatorMac, dispose); | 51 USING_PRE_FINALIZER(ScrollAnimatorMac, dispose); |
52 | 52 |
53 public: | 53 public: |
54 ScrollAnimatorMac(ScrollableArea*); | 54 ScrollAnimatorMac(ScrollableArea*); |
55 ~ScrollAnimatorMac() override; | 55 ~ScrollAnimatorMac() override; |
56 | 56 |
57 void dispose() override; | 57 void dispose() override; |
58 | 58 |
59 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition); | 59 void immediateScrollToOffsetForScrollAnimation(const ScrollOffset& newOffset); |
60 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; } | 60 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; } |
61 | 61 |
62 void updateScrollerStyle(); | 62 void updateScrollerStyle(); |
63 | 63 |
64 bool scrollbarPaintTimerIsActive() const; | 64 bool scrollbarPaintTimerIsActive() const; |
65 void startScrollbarPaintTimer(); | 65 void startScrollbarPaintTimer(); |
66 void stopScrollbarPaintTimer(); | 66 void stopScrollbarPaintTimer(); |
67 | 67 |
68 void sendContentAreaScrolledSoon(const FloatSize& scrollDelta); | 68 void sendContentAreaScrolledSoon(const ScrollOffset& scrollDelta); |
69 | 69 |
70 void setVisibleScrollerThumbRect(const IntRect&); | 70 void setVisibleScrollerThumbRect(const IntRect&); |
71 | 71 |
72 DEFINE_INLINE_VIRTUAL_TRACE() { ScrollAnimatorBase::trace(visitor); } | 72 DEFINE_INLINE_VIRTUAL_TRACE() { ScrollAnimatorBase::trace(visitor); } |
73 | 73 |
74 private: | 74 private: |
75 RetainPtr<id> m_scrollAnimationHelper; | 75 RetainPtr<id> m_scrollAnimationHelper; |
76 RetainPtr<BlinkScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate; | 76 RetainPtr<BlinkScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate; |
77 | 77 |
78 RetainPtr<ScrollbarPainterController> m_scrollbarPainterController; | 78 RetainPtr<ScrollbarPainterController> m_scrollbarPainterController; |
79 RetainPtr<BlinkScrollbarPainterControllerDelegate> | 79 RetainPtr<BlinkScrollbarPainterControllerDelegate> |
80 m_scrollbarPainterControllerDelegate; | 80 m_scrollbarPainterControllerDelegate; |
81 RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; | 81 RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; |
82 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; | 82 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; |
83 | 83 |
84 void initialScrollbarPaintTask(); | 84 void initialScrollbarPaintTask(); |
85 std::unique_ptr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory; | 85 std::unique_ptr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory; |
86 | 86 |
87 void sendContentAreaScrolledTask(); | 87 void sendContentAreaScrolledTask(); |
88 std::unique_ptr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory; | 88 std::unique_ptr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory; |
89 std::unique_ptr<WebTaskRunner> m_taskRunner; | 89 std::unique_ptr<WebTaskRunner> m_taskRunner; |
90 FloatSize m_contentAreaScrolledTimerScrollDelta; | 90 ScrollOffset m_contentAreaScrolledTimerScrollDelta; |
91 | 91 |
92 ScrollResult userScroll(ScrollGranularity, const FloatSize& delta) override; | 92 ScrollResult userScroll(ScrollGranularity, |
93 void scrollToOffsetWithoutAnimation(const FloatPoint&) override; | 93 const ScrollOffset& delta) override; |
| 94 void scrollToOffsetWithoutAnimation(const ScrollOffset&) override; |
94 | 95 |
95 void handleWheelEventPhase(PlatformWheelEventPhase) override; | 96 void handleWheelEventPhase(PlatformWheelEventPhase) override; |
96 | 97 |
97 void cancelAnimation() override; | 98 void cancelAnimation() override; |
98 | 99 |
99 void contentAreaWillPaint() const override; | 100 void contentAreaWillPaint() const override; |
100 void mouseEnteredContentArea() const override; | 101 void mouseEnteredContentArea() const override; |
101 void mouseExitedContentArea() const override; | 102 void mouseExitedContentArea() const override; |
102 void mouseMovedInContentArea() const override; | 103 void mouseMovedInContentArea() const override; |
103 void mouseEnteredScrollbar(Scrollbar&) const override; | 104 void mouseEnteredScrollbar(Scrollbar&) const override; |
104 void mouseExitedScrollbar(Scrollbar&) const override; | 105 void mouseExitedScrollbar(Scrollbar&) const override; |
105 void contentsResized() const override; | 106 void contentsResized() const override; |
106 void contentAreaDidShow() const override; | 107 void contentAreaDidShow() const override; |
107 void contentAreaDidHide() const override; | 108 void contentAreaDidHide() const override; |
108 void didBeginScrollGesture() const; | 109 void didBeginScrollGesture() const; |
109 void didEndScrollGesture() const; | 110 void didEndScrollGesture() const; |
110 void mayBeginScrollGesture() const; | 111 void mayBeginScrollGesture() const; |
111 | 112 |
112 void finishCurrentScrollAnimations() override; | 113 void finishCurrentScrollAnimations() override; |
113 | 114 |
114 void didAddVerticalScrollbar(Scrollbar&) override; | 115 void didAddVerticalScrollbar(Scrollbar&) override; |
115 void willRemoveVerticalScrollbar(Scrollbar&) override; | 116 void willRemoveVerticalScrollbar(Scrollbar&) override; |
116 void didAddHorizontalScrollbar(Scrollbar&) override; | 117 void didAddHorizontalScrollbar(Scrollbar&) override; |
117 void willRemoveHorizontalScrollbar(Scrollbar&) override; | 118 void willRemoveHorizontalScrollbar(Scrollbar&) override; |
118 | 119 |
119 bool shouldScrollbarParticipateInHitTesting(Scrollbar&) override; | 120 bool shouldScrollbarParticipateInHitTesting(Scrollbar&) override; |
120 | 121 |
121 void notifyContentAreaScrolled(const FloatSize& delta) override; | 122 void notifyContentAreaScrolled(const ScrollOffset& delta) override; |
122 | 123 |
123 bool setScrollbarsVisibleForTesting(bool) override; | 124 bool setScrollbarsVisibleForTesting(bool) override; |
124 | 125 |
125 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint&) const; | 126 ScrollOffset adjustScrollOffsetIfNecessary(const ScrollOffset&) const; |
126 | 127 |
127 void immediateScrollTo(const FloatPoint&); | 128 void immediateScrollTo(const ScrollOffset&); |
128 | 129 |
129 bool m_haveScrolledSincePageLoad; | 130 bool m_haveScrolledSincePageLoad; |
130 bool m_needsScrollerStyleUpdate; | 131 bool m_needsScrollerStyleUpdate; |
131 IntRect m_visibleScrollerThumbRect; | 132 IntRect m_visibleScrollerThumbRect; |
132 }; | 133 }; |
133 | 134 |
134 } // namespace blink | 135 } // namespace blink |
135 | 136 |
136 #endif // ScrollAnimatorMac_h | 137 #endif // ScrollAnimatorMac_h |
OLD | NEW |