| Index: ui/compositor/layer_animator.h
|
| diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h
|
| index 5fe0d5c189617d8434fee88cb7e20c0bf8cec99a..edf38119a3b0971fe1e2265ac1e9d1aa9d2107b2 100644
|
| --- a/ui/compositor/layer_animator.h
|
| +++ b/ui/compositor/layer_animator.h
|
| @@ -180,10 +180,10 @@ class COMPOSITOR_EXPORT LayerAnimator
|
| disable_timer_for_test_ = disable_timer;
|
| }
|
|
|
| - void set_last_step_time(base::TimeTicks time) {
|
| + void set_last_step_time(gfx::FrameTime time) {
|
| last_step_time_ = time;
|
| }
|
| - base::TimeTicks last_step_time() const { return last_step_time_; }
|
| + gfx::FrameTime last_step_time() const { return last_step_time_; }
|
|
|
| protected:
|
| virtual ~LayerAnimator();
|
| @@ -193,7 +193,7 @@ class COMPOSITOR_EXPORT LayerAnimator
|
|
|
| // Virtual for testing.
|
| virtual void ProgressAnimation(LayerAnimationSequence* sequence,
|
| - base::TimeTicks now);
|
| + gfx::FrameTime now);
|
|
|
| void ProgressAnimationToEnd(LayerAnimationSequence* sequence);
|
|
|
| @@ -223,8 +223,8 @@ class COMPOSITOR_EXPORT LayerAnimator
|
| typedef std::deque<linked_ptr<LayerAnimationSequence> > AnimationQueue;
|
|
|
| // Implementation of AnimationContainerElement
|
| - virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE;
|
| - virtual void Step(base::TimeTicks time_now) OVERRIDE;
|
| + virtual void SetStartTime(gfx::FrameTime start_time) OVERRIDE;
|
| + virtual void Step(gfx::FrameTime time_now) OVERRIDE;
|
| virtual base::TimeDelta GetTimerInterval() const OVERRIDE;
|
|
|
| // Finishes all animations by either advancing them to their final state or by
|
| @@ -324,7 +324,7 @@ class COMPOSITOR_EXPORT LayerAnimator
|
| gfx::Tween::Type tween_type_;
|
|
|
| // Used for coordinating the starting of animations.
|
| - base::TimeTicks last_step_time_;
|
| + gfx::FrameTime last_step_time_;
|
|
|
| // True if we are being stepped by our container.
|
| bool is_started_;
|
|
|