| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) const | 98 float ScrollAnimatorBase::clampScrollPosition(ScrollbarOrientation orientation,
float pos) const |
| 99 { | 99 { |
| 100 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); | 100 float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation); |
| 101 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); | 101 float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation); |
| 102 return std::max(std::min(pos, maxScrollPos), minScrollPos); | 102 return std::max(std::min(pos, maxScrollPos), minScrollPos); |
| 103 } | 103 } |
| 104 | 104 |
| 105 DEFINE_TRACE(ScrollAnimatorBase) | 105 DEFINE_TRACE(ScrollAnimatorBase) |
| 106 { | 106 { |
| 107 visitor->trace(m_scrollableArea); | 107 visitor->trace(m_scrollableArea); |
| 108 ScrollAnimatorCompositorCoordinator::trace(visitor); |
| 108 } | 109 } |
| 109 | 110 |
| 110 } // namespace blink | 111 } // namespace blink |
| OLD | NEW |