| 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 17 matching lines...) Expand all Loading... |
| 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/ScrollAnimator.h" | 32 #include "platform/scroll/ScrollAnimator.h" |
| 33 | 33 |
| 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/PassOwnPtr.h" | 36 #include "wtf/PassOwnPtr.h" |
| 37 #include <algorithm> | 37 #include <algorithm> |
| 38 | |
| 39 using namespace std; | 38 using namespace std; |
| 40 | 39 |
| 41 namespace WebCore { | 40 namespace WebCore { |
| 42 | 41 |
| 43 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) | 42 ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea) |
| 44 : m_scrollableArea(scrollableArea) | 43 : m_scrollableArea(scrollableArea) |
| 45 , m_currentPosX(0) | 44 , m_currentPosX(0) |
| 46 , m_currentPosY(0) | 45 , m_currentPosY(0) |
| 47 { | 46 { |
| 48 } | 47 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 67 } | 66 } |
| 68 | 67 |
| 69 void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset) | 68 void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset) |
| 70 { | 69 { |
| 71 FloatSize delta = FloatSize(offset.x() - m_currentPosX, offset.y() - m_curre
ntPosY); | 70 FloatSize delta = FloatSize(offset.x() - m_currentPosX, offset.y() - m_curre
ntPosY); |
| 72 m_currentPosX = offset.x(); | 71 m_currentPosX = offset.x(); |
| 73 m_currentPosY = offset.y(); | 72 m_currentPosY = offset.y(); |
| 74 notifyPositionChanged(delta); | 73 notifyPositionChanged(delta); |
| 75 } | 74 } |
| 76 | 75 |
| 77 bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e) | 76 bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e, bool canRubbe
rbandLeft, bool canRubberbandRight) |
| 78 { | 77 { |
| 79 bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar)
; | 78 bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar)
; |
| 80 bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar); | 79 bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar); |
| 81 | 80 |
| 82 // Accept the event if we are scrollable in that direction and can still | 81 // Accept the event if we are scrollable in that direction and can still |
| 83 // scroll any further. | 82 // scroll any further. |
| 84 float deltaX = canScrollX ? e.deltaX() : 0; | 83 float deltaX = canScrollX ? e.deltaX() : 0; |
| 85 float deltaY = canScrollY ? e.deltaY() : 0; | 84 float deltaY = canScrollY ? e.deltaY() : 0; |
| 86 | 85 |
| 87 bool handled = false; | 86 bool handled = false; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 } | 141 } |
| 143 | 142 |
| 144 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) | 143 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) |
| 145 { | 144 { |
| 146 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 145 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
| 147 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 146 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
| 148 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 147 return std::max(std::min(pos, maxScrollPos), minScrollPos); |
| 149 } | 148 } |
| 150 | 149 |
| 151 } // namespace WebCore | 150 } // namespace WebCore |
| OLD | NEW |