| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/base/animation/linear_animation.h" | 5 #include "ui/gfx/animation/linear_animation.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include "ui/base/animation/animation_container.h" | 9 #include "ui/gfx/animation/animation_container.h" |
| 10 #include "ui/base/animation/animation_delegate.h" | 10 #include "ui/gfx/animation/animation_delegate.h" |
| 11 | 11 |
| 12 using base::Time; | 12 using base::Time; |
| 13 using base::TimeDelta; | 13 using base::TimeDelta; |
| 14 | 14 |
| 15 namespace ui { | 15 namespace gfx { |
| 16 | 16 |
| 17 static TimeDelta CalculateInterval(int frame_rate) { | 17 static TimeDelta CalculateInterval(int frame_rate) { |
| 18 int timer_interval = 1000000 / frame_rate; | 18 int timer_interval = 1000000 / frame_rate; |
| 19 if (timer_interval < 10000) | 19 if (timer_interval < 10000) |
| 20 timer_interval = 10000; | 20 timer_interval = 10000; |
| 21 return TimeDelta::FromMicroseconds(timer_interval); | 21 return TimeDelta::FromMicroseconds(timer_interval); |
| 22 } | 22 } |
| 23 | 23 |
| 24 LinearAnimation::LinearAnimation(int frame_rate, | 24 LinearAnimation::LinearAnimation(int frame_rate, |
| 25 AnimationDelegate* delegate) | 25 AnimationDelegate* delegate) |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 in_end_ = false; | 98 in_end_ = false; |
| 99 // Set state_ to ensure we send ended to delegate and not canceled. | 99 // Set state_ to ensure we send ended to delegate and not canceled. |
| 100 state_ = 1; | 100 state_ = 1; |
| 101 AnimateToState(1.0); | 101 AnimateToState(1.0); |
| 102 } | 102 } |
| 103 | 103 |
| 104 bool LinearAnimation::ShouldSendCanceledFromStop() { | 104 bool LinearAnimation::ShouldSendCanceledFromStop() { |
| 105 return state_ != 1; | 105 return state_ != 1; |
| 106 } | 106 } |
| 107 | 107 |
| 108 } // namespace ui | 108 } // namespace gfx |
| OLD | NEW |