| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; | 84 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; |
| 85 | 85 |
| 86 void initialScrollbarPaintTask(); | 86 void initialScrollbarPaintTask(); |
| 87 OwnPtr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory; | 87 OwnPtr<CancellableTaskFactory> m_initialScrollbarPaintTaskFactory; |
| 88 | 88 |
| 89 void sendContentAreaScrolledTask(); | 89 void sendContentAreaScrolledTask(); |
| 90 OwnPtr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory; | 90 OwnPtr<CancellableTaskFactory> m_sendContentAreaScrolledTaskFactory; |
| 91 OwnPtr<WebTaskRunner> m_taskRunner; | 91 OwnPtr<WebTaskRunner> m_taskRunner; |
| 92 FloatSize m_contentAreaScrolledTimerScrollDelta; | 92 FloatSize m_contentAreaScrolledTimerScrollDelta; |
| 93 | 93 |
| 94 ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularit
y, float delta) override; | 94 ScrollResult userScroll(ScrollGranularity, const FloatSize& delta) override; |
| 95 void scrollToOffsetWithoutAnimation(const FloatPoint&) override; | 95 void scrollToOffsetWithoutAnimation(const FloatPoint&) override; |
| 96 | 96 |
| 97 void handleWheelEventPhase(PlatformWheelEventPhase) override; | 97 void handleWheelEventPhase(PlatformWheelEventPhase) override; |
| 98 | 98 |
| 99 void cancelAnimation() override; | 99 void cancelAnimation() override; |
| 100 | 100 |
| 101 void contentAreaWillPaint() const override; | 101 void contentAreaWillPaint() const override; |
| 102 void mouseEnteredContentArea() const override; | 102 void mouseEnteredContentArea() const override; |
| 103 void mouseExitedContentArea() const override; | 103 void mouseExitedContentArea() const override; |
| 104 void mouseMovedInContentArea() const override; | 104 void mouseMovedInContentArea() const override; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 131 void immediateScrollTo(const FloatPoint&); | 131 void immediateScrollTo(const FloatPoint&); |
| 132 | 132 |
| 133 bool m_haveScrolledSincePageLoad; | 133 bool m_haveScrolledSincePageLoad; |
| 134 bool m_needsScrollerStyleUpdate; | 134 bool m_needsScrollerStyleUpdate; |
| 135 IntRect m_visibleScrollerThumbRect; | 135 IntRect m_visibleScrollerThumbRect; |
| 136 }; | 136 }; |
| 137 | 137 |
| 138 } // namespace blink | 138 } // namespace blink |
| 139 | 139 |
| 140 #endif // ScrollAnimatorMac_h | 140 #endif // ScrollAnimatorMac_h |
| OLD | NEW |