Index: cc/animation/scrollbar_animation_controller.h |
diff --git a/cc/animation/scrollbar_animation_controller.h b/cc/animation/scrollbar_animation_controller.h |
index ecef4fb2d9728cec7789c4336524a7d76f0a731c..7cb86b34d56ef3cc728e16c981548629383ec583 100644 |
--- a/cc/animation/scrollbar_animation_controller.h |
+++ b/cc/animation/scrollbar_animation_controller.h |
@@ -8,6 +8,7 @@ |
#include "base/time/time.h" |
#include "cc/base/cc_export.h" |
#include "ui/gfx/vector2d_f.h" |
+#include "ui/gfx/frame_time.h" |
namespace cc { |
@@ -19,16 +20,18 @@ class CC_EXPORT ScrollbarAnimationController { |
virtual ~ScrollbarAnimationController() {} |
virtual bool IsAnimating() const = 0; |
- virtual base::TimeDelta DelayBeforeStart(base::TimeTicks now) const = 0; |
+ virtual base::TimeDelta DelayBeforeStart(gfx::FrameTime now) |
+ const = 0; |
- virtual bool Animate(base::TimeTicks now) = 0; |
+ virtual bool Animate(gfx::FrameTime now) = 0; |
virtual void DidScrollGestureBegin() = 0; |
- virtual void DidScrollGestureEnd(base::TimeTicks now) = 0; |
- virtual void DidMouseMoveOffScrollbar(base::TimeTicks now) = 0; |
+ virtual void DidScrollGestureEnd(gfx::FrameTime now) = 0; |
+ virtual void DidMouseMoveOffScrollbar(gfx::FrameTime now) = 0; |
// Returns true if we should start an animation. |
- virtual bool DidScrollUpdate(base::TimeTicks now) = 0; |
- virtual bool DidMouseMoveNear(base::TimeTicks now, float distance) = 0; |
+ virtual bool DidScrollUpdate(gfx::FrameTime now) = 0; |
+ virtual bool DidMouseMoveNear(gfx::FrameTime now, float distance) |
+ = 0; |
}; |
} // namespace cc |