| 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 13 matching lines...) Expand all Loading... |
| 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 "core/platform/ScrollAnimator.h" |
| 33 | 33 |
| 34 #include <algorithm> | |
| 35 #include "core/platform/PlatformWheelEvent.h" | 34 #include "core/platform/PlatformWheelEvent.h" |
| 36 #include "core/platform/ScrollableArea.h" | 35 #include "core/platform/ScrollableArea.h" |
| 37 #include "core/platform/graphics/FloatPoint.h" | 36 #include "platform/geometry/FloatPoint.h" |
| 38 #include "wtf/PassOwnPtr.h" | 37 #include "wtf/PassOwnPtr.h" |
| 38 #include <algorithm> |
| 39 | 39 |
| 40 using namespace std; | 40 using namespace std; |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) | 44 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) |
| 45 : m_scrollableArea(scrollableArea) | 45 : m_scrollableArea(scrollableArea) |
| 46 , m_currentPosX(0) | 46 , m_currentPosX(0) |
| 47 , m_currentPosY(0) | 47 , m_currentPosY(0) |
| 48 { | 48 { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 } | 143 } |
| 144 | 144 |
| 145 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) | 145 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) |
| 146 { | 146 { |
| 147 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 147 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
| 148 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 148 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
| 149 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 149 return std::max(std::min(pos, maxScrollPos), minScrollPos); |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace WebCore | 152 } // namespace WebCore |
| OLD | NEW |