Chromium Code Reviews| 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 27 matching lines...) Expand all Loading... | |
| 38 OBJC_CLASS BlinkScrollbarPainterControllerDelegate; | 38 OBJC_CLASS BlinkScrollbarPainterControllerDelegate; |
| 39 OBJC_CLASS BlinkScrollbarPainterDelegate; | 39 OBJC_CLASS BlinkScrollbarPainterDelegate; |
| 40 | 40 |
| 41 typedef id ScrollbarPainterController; | 41 typedef id ScrollbarPainterController; |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 class Scrollbar; | 45 class Scrollbar; |
| 46 | 46 |
| 47 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimatorBase { | 47 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimatorBase { |
| 48 WILL_BE_USING_PRE_FINALIZER(ScrollAnimatorMac, dispose); | |
|
ajuma
2016/02/22 15:15:01
I'm not sure about this change. Is this because yo
ymalik
2016/02/22 19:22:56
You're right. This should stay.
| |
| 49 public: | 48 public: |
| 50 ScrollAnimatorMac(ScrollableArea*); | 49 ScrollAnimatorMac(ScrollableArea*); |
| 51 ~ScrollAnimatorMac() override; | 50 ~ScrollAnimatorMac() override; |
| 52 | 51 |
| 53 void dispose() override; | 52 void dispose() override; |
| 54 | 53 |
| 55 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition) ; | 54 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition) ; |
| 56 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; } | 55 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad; } |
| 57 | 56 |
| 58 void updateScrollerStyle(); | 57 void updateScrollerStyle(); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 128 void immediateScrollTo(const FloatPoint&); | 127 void immediateScrollTo(const FloatPoint&); |
| 129 | 128 |
| 130 bool m_haveScrolledSincePageLoad; | 129 bool m_haveScrolledSincePageLoad; |
| 131 bool m_needsScrollerStyleUpdate; | 130 bool m_needsScrollerStyleUpdate; |
| 132 IntRect m_visibleScrollerThumbRect; | 131 IntRect m_visibleScrollerThumbRect; |
| 133 }; | 132 }; |
| 134 | 133 |
| 135 } // namespace blink | 134 } // namespace blink |
| 136 | 135 |
| 137 #endif // ScrollAnimatorMac_h | 136 #endif // ScrollAnimatorMac_h |
| OLD | NEW |