OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "platform/scroll/ScrollAnimatorBase.h" | 32 #include "platform/scroll/ScrollAnimatorBase.h" |
33 | 33 |
34 #include "platform/RuntimeEnabledFeatures.h" | 34 #include "platform/RuntimeEnabledFeatures.h" |
35 #include "platform/geometry/FloatPoint.h" | 35 #include "platform/geometry/FloatPoint.h" |
36 #include "platform/scroll/ScrollableArea.h" | 36 #include "platform/scroll/ScrollableArea.h" |
| 37 #include "wtf/MathExtras.h" |
37 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PassOwnPtr.h" |
38 #include <algorithm> | |
39 | 39 |
40 namespace blink { | 40 namespace blink { |
41 | 41 |
42 ScrollAnimatorBase::ScrollAnimatorBase(ScrollableArea* scrollableArea) | 42 ScrollAnimatorBase::ScrollAnimatorBase(ScrollableArea* scrollableArea) |
43 : m_scrollableArea(scrollableArea) | 43 : m_scrollableArea(scrollableArea) |
44 , m_currentPosX(0) | 44 , m_currentPosX(0) |
45 , m_currentPosY(0) | 45 , m_currentPosY(0) |
46 { | 46 { |
47 } | 47 } |
48 | 48 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 | 92 |
93 void ScrollAnimatorBase::notifyPositionChanged() | 93 void ScrollAnimatorBase::notifyPositionChanged() |
94 { | 94 { |
95 m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_current
PosY), UserScroll); | 95 m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_current
PosY), UserScroll); |
96 } | 96 } |
97 | 97 |
98 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) const | 98 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) const |
99 { | 99 { |
100 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 100 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
101 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 101 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
102 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 102 return clampTo(pos, minScrollPos, maxScrollPos); |
103 } | 103 } |
104 | 104 |
105 DEFINE_TRACE(ScrollAnimatorBase) | 105 DEFINE_TRACE(ScrollAnimatorBase) |
106 { | 106 { |
107 visitor->trace(m_scrollableArea); | 107 visitor->trace(m_scrollableArea); |
108 } | 108 } |
109 | 109 |
110 } // namespace blink | 110 } // namespace blink |
OLD | NEW |