| 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 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #ifndef ScrollAnimatorMac_h | 26 #ifndef ScrollAnimatorMac_h |
| 27 #define ScrollAnimatorMac_h | 27 #define ScrollAnimatorMac_h |
| 28 | 28 |
| 29 #include "platform/Timer.h" | 29 #include "platform/Timer.h" |
| 30 #include "platform/WebTaskRunner.h" | 30 #include "platform/WebTaskRunner.h" |
| 31 #include "platform/geometry/FloatPoint.h" | 31 #include "platform/geometry/FloatPoint.h" |
| 32 #include "platform/geometry/FloatSize.h" | 32 #include "platform/geometry/FloatSize.h" |
| 33 #include "platform/geometry/IntRect.h" | 33 #include "platform/geometry/IntRect.h" |
| 34 #include "platform/heap/Handle.h" | 34 #include "platform/heap/Handle.h" |
| 35 #include "platform/scheduler/CancellableTaskFactory.h" | |
| 36 #include "platform/scroll/ScrollAnimatorBase.h" | 35 #include "platform/scroll/ScrollAnimatorBase.h" |
| 37 #include "wtf/RetainPtr.h" | 36 #include "wtf/RetainPtr.h" |
| 38 #include <memory> | 37 #include <memory> |
| 39 | 38 |
| 40 OBJC_CLASS BlinkScrollAnimationHelperDelegate; | 39 OBJC_CLASS BlinkScrollAnimationHelperDelegate; |
| 41 OBJC_CLASS BlinkScrollbarPainterControllerDelegate; | 40 OBJC_CLASS BlinkScrollbarPainterControllerDelegate; |
| 42 OBJC_CLASS BlinkScrollbarPainterDelegate; | 41 OBJC_CLASS BlinkScrollbarPainterDelegate; |
| 43 | 42 |
| 44 typedef id ScrollbarPainterController; | 43 typedef id ScrollbarPainterController; |
| 45 | 44 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 75 RetainPtr<id> m_scrollAnimationHelper; | 74 RetainPtr<id> m_scrollAnimationHelper; |
| 76 RetainPtr<BlinkScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate; | 75 RetainPtr<BlinkScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate; |
| 77 | 76 |
| 78 RetainPtr<ScrollbarPainterController> m_scrollbarPainterController; | 77 RetainPtr<ScrollbarPainterController> m_scrollbarPainterController; |
| 79 RetainPtr<BlinkScrollbarPainterControllerDelegate> | 78 RetainPtr<BlinkScrollbarPainterControllerDelegate> |
| 80 m_scrollbarPainterControllerDelegate; | 79 m_scrollbarPainterControllerDelegate; |
| 81 RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; | 80 RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; |
| 82 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; | 81 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; |
| 83 | 82 |
| 84 void initialScrollbarPaintTask(); | 83 void initialScrollbarPaintTask(); |
| 85 std::unique_ptr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory; | 84 TaskHandle m_initialScrollbarPaintTaskHandle; |
| 86 | 85 |
| 87 void sendContentAreaScrolledTask(); | 86 void sendContentAreaScrolledTask(); |
| 88 std::unique_ptr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory; | 87 TaskHandle m_sendContentAreaScrolledTaskHandle; |
| 89 std::unique_ptr<WebTaskRunner> m_taskRunner; | 88 std::unique_ptr<WebTaskRunner> m_taskRunner; |
| 90 ScrollOffset m_contentAreaScrolledTimerScrollDelta; | 89 ScrollOffset m_contentAreaScrolledTimerScrollDelta; |
| 91 | 90 |
| 92 ScrollResult userScroll(ScrollGranularity, | 91 ScrollResult userScroll(ScrollGranularity, |
| 93 const ScrollOffset& delta) override; | 92 const ScrollOffset& delta) override; |
| 94 void scrollToOffsetWithoutAnimation(const ScrollOffset&) override; | 93 void scrollToOffsetWithoutAnimation(const ScrollOffset&) override; |
| 95 | 94 |
| 96 void handleWheelEventPhase(PlatformWheelEventPhase) override; | 95 void handleWheelEventPhase(PlatformWheelEventPhase) override; |
| 97 | 96 |
| 98 void cancelAnimation() override; | 97 void cancelAnimation() override; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 126 void immediateScrollTo(const ScrollOffset&); | 125 void immediateScrollTo(const ScrollOffset&); |
| 127 | 126 |
| 128 bool m_haveScrolledSincePageLoad; | 127 bool m_haveScrolledSincePageLoad; |
| 129 bool m_needsScrollerStyleUpdate; | 128 bool m_needsScrollerStyleUpdate; |
| 130 IntRect m_visibleScrollerThumbRect; | 129 IntRect m_visibleScrollerThumbRect; |
| 131 }; | 130 }; |
| 132 | 131 |
| 133 } // namespace blink | 132 } // namespace blink |
| 134 | 133 |
| 135 #endif // ScrollAnimatorMac_h | 134 #endif // ScrollAnimatorMac_h |
| OLD | NEW |