Index: cc/animation/scrollbar_animation_controller_thinning.cc |
diff --git a/cc/animation/scrollbar_animation_controller_thinning.cc b/cc/animation/scrollbar_animation_controller_thinning.cc |
index ce196fbf955e61320af9a5669f011ced1437f185..9e99e94ed7db240090f6237cdd8146179a76b01b 100644 |
--- a/cc/animation/scrollbar_animation_controller_thinning.cc |
+++ b/cc/animation/scrollbar_animation_controller_thinning.cc |
@@ -47,13 +47,13 @@ bool ScrollbarAnimationControllerThinning::IsAnimating() const { |
} |
base::TimeDelta ScrollbarAnimationControllerThinning::DelayBeforeStart( |
- base::TimeTicks now) const { |
+ gfx::FrameTime now) const { |
if (now > last_awaken_time_ + animation_delay_) |
return base::TimeDelta(); |
return animation_delay_ - (now - last_awaken_time_); |
} |
-bool ScrollbarAnimationControllerThinning::Animate(base::TimeTicks now) { |
+bool ScrollbarAnimationControllerThinning::Animate(gfx::FrameTime now) { |
if (mouse_is_over_scrollbar_) { |
ApplyOpacityAndThumbThicknessScale(1, 1); |
return false; |
@@ -64,30 +64,30 @@ bool ScrollbarAnimationControllerThinning::Animate(base::TimeTicks now) { |
progress); |
ApplyOpacityAndThumbThicknessScale(opacity, thumb_thickness_scale); |
if (progress == 1.f) |
- last_awaken_time_ = base::TimeTicks(); |
+ last_awaken_time_ = gfx::FrameTime(); |
return IsAnimating() && DelayBeforeStart(now) == base::TimeDelta(); |
} |
void ScrollbarAnimationControllerThinning::DidScrollGestureBegin() { |
ApplyOpacityAndThumbThicknessScale(1, 1); |
- last_awaken_time_ = base::TimeTicks(); |
+ last_awaken_time_ = gfx::FrameTime(); |
scroll_gesture_in_progress_ = true; |
} |
void ScrollbarAnimationControllerThinning::DidScrollGestureEnd( |
- base::TimeTicks now) { |
+ gfx::FrameTime now) { |
last_awaken_time_ = now; |
scroll_gesture_in_progress_ = false; |
} |
void ScrollbarAnimationControllerThinning::DidMouseMoveOffScrollbar( |
- base::TimeTicks now) { |
+ gfx::FrameTime now) { |
mouse_is_over_scrollbar_ = false; |
DidScrollUpdate(now); |
} |
bool ScrollbarAnimationControllerThinning::DidScrollUpdate( |
- base::TimeTicks now) { |
+ gfx::FrameTime now) { |
ApplyOpacityAndThumbThicknessScale(1, 1); |
last_awaken_time_ = now; |
@@ -95,7 +95,7 @@ bool ScrollbarAnimationControllerThinning::DidScrollUpdate( |
} |
bool ScrollbarAnimationControllerThinning::DidMouseMoveNear( |
- base::TimeTicks now, float distance) { |
+ gfx::FrameTime now, float distance) { |
if (distance == 0.0) { |
mouse_is_over_scrollbar_ = true; |
return false; |
@@ -108,7 +108,7 @@ bool ScrollbarAnimationControllerThinning::DidMouseMoveNear( |
} |
float ScrollbarAnimationControllerThinning::AnimationProgressAtTime( |
- base::TimeTicks now) { |
+ gfx::FrameTime now) { |
if (scroll_gesture_in_progress_) |
return 0; |