| Index: ui/gfx/animation/multi_animation.cc
|
| diff --git a/ui/gfx/animation/multi_animation.cc b/ui/gfx/animation/multi_animation.cc
|
| index 4ecc73c805a7059a189ddba4840393c9720c2a4c..67ae24c36b06560e53d91d46725ac3e4b3f0bcaa 100644
|
| --- a/ui/gfx/animation/multi_animation.cc
|
| +++ b/ui/gfx/animation/multi_animation.cc
|
| @@ -43,7 +43,7 @@ double MultiAnimation::GetCurrentValue() const {
|
| return current_value_;
|
| }
|
|
|
| -void MultiAnimation::Step(base::TimeTicks time_now) {
|
| +void MultiAnimation::Step(gfx::FrameTime time_now) {
|
| double last_value = current_value_;
|
| size_t last_index = current_part_index_;
|
|
|
| @@ -67,7 +67,7 @@ void MultiAnimation::Step(base::TimeTicks time_now) {
|
| }
|
| }
|
|
|
| -void MultiAnimation::SetStartTime(base::TimeTicks start_time) {
|
| +void MultiAnimation::SetStartTime(gfx::FrameTime start_time) {
|
| Animation::SetStartTime(start_time);
|
| current_value_ = 0;
|
| current_part_index_ = 0;
|
|
|