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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_current
PosY), UserScroll); | 88 m_scrollableArea->scrollPositionChanged(DoublePoint(m_currentPosX, m_current
PosY), UserScroll); |
89 } | 89 } |
90 | 90 |
91 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) | 91 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) |
92 { | 92 { |
93 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 93 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
94 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 94 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
95 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 95 return std::max(std::min(pos, maxScrollPos), minScrollPos); |
96 } | 96 } |
97 | 97 |
| 98 DEFINE_TRACE(ScrollAnimatorBase) |
| 99 { |
| 100 visitor->trace(m_scrollableArea); |
| 101 } |
| 102 |
98 } // namespace blink | 103 } // namespace blink |
OLD | NEW |