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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
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 "config.h" | 31 #include "config.h" |
32 #include "core/platform/ScrollAnimator.h" | 32 #include "platform/scroll/ScrollAnimator.h" |
33 | 33 |
34 #include "core/platform/ScrollableArea.h" | |
35 #include "platform/geometry/FloatPoint.h" | 34 #include "platform/geometry/FloatPoint.h" |
| 35 #include "platform/scroll/ScrollableArea.h" |
36 #include "wtf/PassOwnPtr.h" | 36 #include "wtf/PassOwnPtr.h" |
37 #include <algorithm> | 37 #include <algorithm> |
38 | 38 |
39 using namespace std; | 39 using namespace std; |
40 | 40 |
41 namespace WebCore { | 41 namespace WebCore { |
42 | 42 |
43 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) | 43 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) |
44 : m_scrollableArea(scrollableArea) | 44 : m_scrollableArea(scrollableArea) |
45 , m_currentPosX(0) | 45 , m_currentPosX(0) |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 } | 142 } |
143 | 143 |
144 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) | 144 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) |
145 { | 145 { |
146 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 146 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
147 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 147 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
148 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 148 return std::max(std::min(pos, maxScrollPos), minScrollPos); |
149 } | 149 } |
150 | 150 |
151 } // namespace WebCore | 151 } // namespace WebCore |
OLD | NEW |