| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011, Google Inc. All rights reserved. | 2 * Copyright (c) 2011, 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 { | 88 { |
| 89 FloatPoint pos = desiredTargetPosition(); | 89 FloatPoint pos = desiredTargetPosition(); |
| 90 FloatPoint newPos = toFloatPoint(m_scrollableArea->clampScrollPosition(pos +
delta)); | 90 FloatPoint newPos = toFloatPoint(m_scrollableArea->clampScrollPosition(pos +
delta)); |
| 91 return newPos - pos; | 91 return newPos - pos; |
| 92 } | 92 } |
| 93 | 93 |
| 94 void ScrollAnimator::resetAnimationState() | 94 void ScrollAnimator::resetAnimationState() |
| 95 { | 95 { |
| 96 ScrollAnimatorCompositorCoordinator::resetAnimationState(); | 96 ScrollAnimatorCompositorCoordinator::resetAnimationState(); |
| 97 if (m_animationCurve) | 97 if (m_animationCurve) |
| 98 m_animationCurve.clear(); | 98 m_animationCurve.reset(); |
| 99 m_startTime = 0.0; | 99 m_startTime = 0.0; |
| 100 } | 100 } |
| 101 | 101 |
| 102 ScrollResult ScrollAnimator::userScroll( | 102 ScrollResult ScrollAnimator::userScroll( |
| 103 ScrollGranularity granularity, const FloatSize& delta) | 103 ScrollGranularity granularity, const FloatSize& delta) |
| 104 { | 104 { |
| 105 if (!m_scrollableArea->scrollAnimatorEnabled()) | 105 if (!m_scrollableArea->scrollAnimatorEnabled()) |
| 106 return ScrollAnimatorBase::userScroll(granularity, delta); | 106 return ScrollAnimatorBase::userScroll(granularity, delta); |
| 107 | 107 |
| 108 TRACE_EVENT0("blink", "ScrollAnimator::scroll"); | 108 TRACE_EVENT0("blink", "ScrollAnimator::scroll"); |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 } | 427 } |
| 428 return true; | 428 return true; |
| 429 } | 429 } |
| 430 | 430 |
| 431 DEFINE_TRACE(ScrollAnimator) | 431 DEFINE_TRACE(ScrollAnimator) |
| 432 { | 432 { |
| 433 ScrollAnimatorBase::trace(visitor); | 433 ScrollAnimatorBase::trace(visitor); |
| 434 } | 434 } |
| 435 | 435 |
| 436 } // namespace blink | 436 } // namespace blink |
| OLD | NEW |