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 15 matching lines...) Expand all Loading... |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
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 "platform/scroll/ScrollAnimatorBase.h" | 31 #include "platform/scroll/ScrollAnimatorBase.h" |
32 | 32 |
33 #include "platform/RuntimeEnabledFeatures.h" | 33 #include "platform/RuntimeEnabledFeatures.h" |
34 #include "platform/geometry/FloatPoint.h" | 34 #include "platform/geometry/FloatPoint.h" |
35 #include "platform/scroll/ScrollableArea.h" | 35 #include "platform/scroll/ScrollableArea.h" |
| 36 #include "wtf/MathExtras.h" |
36 #include "wtf/PassOwnPtr.h" | 37 #include "wtf/PassOwnPtr.h" |
37 #include <algorithm> | |
38 | 38 |
39 namespace blink { | 39 namespace blink { |
40 | 40 |
41 ScrollAnimatorBase::ScrollAnimatorBase(ScrollableArea* scrollableArea) | 41 ScrollAnimatorBase::ScrollAnimatorBase(ScrollableArea* scrollableArea) |
42 : m_scrollableArea(scrollableArea) | 42 : m_scrollableArea(scrollableArea) |
43 , m_currentPosX(0) | 43 , m_currentPosX(0) |
44 , m_currentPosY(0) | 44 , m_currentPosY(0) |
45 { | 45 { |
46 } | 46 } |
47 | 47 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 | 91 |
92 void ScrollAnimatorBase::notifyPositionChanged() | 92 void ScrollAnimatorBase::notifyPositionChanged() |
93 { | 93 { |
94 m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_current
PosY), UserScroll); | 94 m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_current
PosY), UserScroll); |
95 } | 95 } |
96 | 96 |
97 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) const | 97 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) const |
98 { | 98 { |
99 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 99 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
100 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 100 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
101 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 101 return clampTo(pos, minScrollPos, maxScrollPos); |
102 } | 102 } |
103 | 103 |
104 DEFINE_TRACE(ScrollAnimatorBase) | 104 DEFINE_TRACE(ScrollAnimatorBase) |
105 { | 105 { |
106 visitor->trace(m_scrollableArea); | 106 visitor->trace(m_scrollableArea); |
107 } | 107 } |
108 | 108 |
109 } // namespace blink | 109 } // namespace blink |
OLD | NEW |