| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 RetainPtr<BlinkScrollbarPainterControllerDelegate> | 78 RetainPtr<BlinkScrollbarPainterControllerDelegate> |
| 79 m_scrollbarPainterControllerDelegate; | 79 m_scrollbarPainterControllerDelegate; |
| 80 RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; | 80 RetainPtr<BlinkScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate; |
| 81 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; | 81 RetainPtr<BlinkScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate; |
| 82 | 82 |
| 83 void initialScrollbarPaintTask(); | 83 void initialScrollbarPaintTask(); |
| 84 TaskHandle m_initialScrollbarPaintTaskHandle; | 84 TaskHandle m_initialScrollbarPaintTaskHandle; |
| 85 | 85 |
| 86 void sendContentAreaScrolledTask(); | 86 void sendContentAreaScrolledTask(); |
| 87 TaskHandle m_sendContentAreaScrolledTaskHandle; | 87 TaskHandle m_sendContentAreaScrolledTaskHandle; |
| 88 std::unique_ptr<WebTaskRunner> m_taskRunner; | 88 RefPtr<WebTaskRunner> m_taskRunner; |
| 89 ScrollOffset m_contentAreaScrolledTimerScrollDelta; | 89 ScrollOffset m_contentAreaScrolledTimerScrollDelta; |
| 90 | 90 |
| 91 ScrollResult userScroll(ScrollGranularity, | 91 ScrollResult userScroll(ScrollGranularity, |
| 92 const ScrollOffset& delta) override; | 92 const ScrollOffset& delta) override; |
| 93 void scrollToOffsetWithoutAnimation(const ScrollOffset&) override; | 93 void scrollToOffsetWithoutAnimation(const ScrollOffset&) override; |
| 94 | 94 |
| 95 void cancelAnimation() override; | 95 void cancelAnimation() override; |
| 96 | 96 |
| 97 void contentAreaWillPaint() const override; | 97 void contentAreaWillPaint() const override; |
| 98 void mouseEnteredContentArea() const override; | 98 void mouseEnteredContentArea() const override; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 120 void immediateScrollTo(const ScrollOffset&); | 120 void immediateScrollTo(const ScrollOffset&); |
| 121 | 121 |
| 122 bool m_haveScrolledSincePageLoad; | 122 bool m_haveScrolledSincePageLoad; |
| 123 bool m_needsScrollerStyleUpdate; | 123 bool m_needsScrollerStyleUpdate; |
| 124 IntRect m_visibleScrollerThumbRect; | 124 IntRect m_visibleScrollerThumbRect; |
| 125 }; | 125 }; |
| 126 | 126 |
| 127 } // namespace blink | 127 } // namespace blink |
| 128 | 128 |
| 129 #endif // ScrollAnimatorMac_h | 129 #endif // ScrollAnimatorMac_h |
| OLD | NEW |