| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/scrollbar_animation_controller_linear_fade.h" | 7 #include "cc/scrollbar_animation_controller_linear_fade.h" |
| 8 | 8 |
| 9 #include "cc/scrollbar_layer_impl.h" | 9 #include "cc/scrollbar_layer_impl.h" |
| 10 | 10 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 } | 44 } |
| 45 | 45 |
| 46 void ScrollbarAnimationControllerLinearFade::didPinchGestureEndAtTime(double mon
otonicTime) | 46 void ScrollbarAnimationControllerLinearFade::didPinchGestureEndAtTime(double mon
otonicTime) |
| 47 { | 47 { |
| 48 m_pinchGestureInEffect = false; | 48 m_pinchGestureInEffect = false; |
| 49 m_lastAwakenTime = monotonicTime; | 49 m_lastAwakenTime = monotonicTime; |
| 50 } | 50 } |
| 51 | 51 |
| 52 void ScrollbarAnimationControllerLinearFade::updateScrollOffsetAtTime(LayerImpl*
scrollLayer, double monotonicTime) | 52 void ScrollbarAnimationControllerLinearFade::updateScrollOffsetAtTime(LayerImpl*
scrollLayer, double monotonicTime) |
| 53 { | 53 { |
| 54 FloatPoint previousPos = currentPos(); | 54 gfx::Vector2dF previousPos = currentOffset(); |
| 55 ScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, monotoni
cTime); | 55 ScrollbarAnimationController::updateScrollOffsetAtTime(scrollLayer, monotoni
cTime); |
| 56 | 56 |
| 57 if (previousPos == currentPos()) | 57 if (previousPos == currentOffset()) |
| 58 return; | 58 return; |
| 59 | 59 |
| 60 m_lastAwakenTime = monotonicTime; | 60 m_lastAwakenTime = monotonicTime; |
| 61 } | 61 } |
| 62 | 62 |
| 63 float ScrollbarAnimationControllerLinearFade::opacityAtTime(double monotonicTime
) | 63 float ScrollbarAnimationControllerLinearFade::opacityAtTime(double monotonicTime
) |
| 64 { | 64 { |
| 65 if (m_pinchGestureInEffect) | 65 if (m_pinchGestureInEffect) |
| 66 return 1; | 66 return 1; |
| 67 | 67 |
| 68 double delta = monotonicTime - m_lastAwakenTime; | 68 double delta = monotonicTime - m_lastAwakenTime; |
| 69 | 69 |
| 70 if (delta <= m_fadeoutDelay) | 70 if (delta <= m_fadeoutDelay) |
| 71 return 1; | 71 return 1; |
| 72 if (delta < m_fadeoutDelay + m_fadeoutLength) | 72 if (delta < m_fadeoutDelay + m_fadeoutLength) |
| 73 return (m_fadeoutDelay + m_fadeoutLength - delta) / m_fadeoutLength; | 73 return (m_fadeoutDelay + m_fadeoutLength - delta) / m_fadeoutLength; |
| 74 return 0; | 74 return 0; |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace cc | 77 } // namespace cc |
| OLD | NEW |