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 |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' |
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS |
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #ifndef ScrollAnimatorMac_h | 26 #ifndef ScrollAnimatorMac_h |
27 #define ScrollAnimatorMac_h | 27 #define ScrollAnimatorMac_h |
28 | 28 |
29 #include "core/platform/ScrollAnimator.h" | |
30 #include "core/platform/mac/ScrollElasticityController.h" | |
31 #include "platform/Timer.h" | 29 #include "platform/Timer.h" |
32 #include "platform/geometry/FloatPoint.h" | 30 #include "platform/geometry/FloatPoint.h" |
33 #include "platform/geometry/FloatSize.h" | 31 #include "platform/geometry/FloatSize.h" |
34 #include "platform/geometry/IntRect.h" | 32 #include "platform/geometry/IntRect.h" |
| 33 #include "platform/mac/ScrollElasticityController.h" |
| 34 #include "platform/scroll/ScrollAnimator.h" |
35 #include "wtf/RetainPtr.h" | 35 #include "wtf/RetainPtr.h" |
36 | 36 |
37 OBJC_CLASS WebScrollAnimationHelperDelegate; | 37 OBJC_CLASS WebScrollAnimationHelperDelegate; |
38 OBJC_CLASS WebScrollbarPainterControllerDelegate; | 38 OBJC_CLASS WebScrollbarPainterControllerDelegate; |
39 OBJC_CLASS WebScrollbarPainterDelegate; | 39 OBJC_CLASS WebScrollbarPainterDelegate; |
40 | 40 |
41 typedef id ScrollbarPainterController; | 41 typedef id ScrollbarPainterController; |
42 | 42 |
43 #if !USE(RUBBER_BANDING) | 43 #if !USE(RUBBER_BANDING) |
44 class ScrollElasticityControllerClient { }; | 44 class ScrollElasticityControllerClient { }; |
45 #endif | 45 #endif |
46 | 46 |
47 namespace WebCore { | 47 namespace WebCore { |
48 | 48 |
49 class Scrollbar; | 49 class Scrollbar; |
50 | 50 |
51 class ScrollAnimatorMac : public ScrollAnimator, private ScrollElasticityControl
lerClient { | 51 class PLATFORM_EXPORT ScrollAnimatorMac : public ScrollAnimator, private ScrollE
lasticityControllerClient { |
52 | 52 |
53 public: | 53 public: |
54 ScrollAnimatorMac(ScrollableArea*); | 54 ScrollAnimatorMac(ScrollableArea*); |
55 virtual ~ScrollAnimatorMac(); | 55 virtual ~ScrollAnimatorMac(); |
56 | 56 |
57 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition)
; | 57 void immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition)
; |
58 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad;
} | 58 bool haveScrolledSincePageLoad() const { return m_haveScrolledSincePageLoad;
} |
59 | 59 |
60 void updateScrollerStyle(); | 60 void updateScrollerStyle(); |
61 | 61 |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 #endif | 153 #endif |
154 | 154 |
155 bool m_haveScrolledSincePageLoad; | 155 bool m_haveScrolledSincePageLoad; |
156 bool m_needsScrollerStyleUpdate; | 156 bool m_needsScrollerStyleUpdate; |
157 IntRect m_visibleScrollerThumbRect; | 157 IntRect m_visibleScrollerThumbRect; |
158 }; | 158 }; |
159 | 159 |
160 } // namespace WebCore | 160 } // namespace WebCore |
161 | 161 |
162 #endif // ScrollAnimatorMac_h | 162 #endif // ScrollAnimatorMac_h |
OLD | NEW |