| 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 20 matching lines...) Expand all Loading... |
| 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 | 38 |
| 39 using namespace std; | 39 using namespace std; |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace blink { |
| 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) |
| 46 , m_currentPosY(0) | 46 , m_currentPosY(0) |
| 47 { | 47 { |
| 48 } | 48 } |
| 49 | 49 |
| 50 ScrollAnimator::~ScrollAnimator() | 50 ScrollAnimator::~ScrollAnimator() |
| 51 { | 51 { |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 m_scrollableArea->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_cur
rentPosY)); | 138 m_scrollableArea->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_cur
rentPosY)); |
| 139 } | 139 } |
| 140 | 140 |
| 141 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) | 141 float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, floa
t pos) |
| 142 { | 142 { |
| 143 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 143 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
| 144 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 144 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
| 145 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 145 return std::max(std::min(pos, maxScrollPos), minScrollPos); |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace WebCore | 148 } // namespace blink |
| OLD | NEW |