diff options
Diffstat (limited to 'cc/scrollbar_animation_controller.cc')
| -rw-r--r-- | cc/scrollbar_animation_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc index 534ec3c..f52099f 100644 --- a/cc/scrollbar_animation_controller.cc +++ b/cc/scrollbar_animation_controller.cc @@ -7,7 +7,7 @@ #include "CCScrollbarAnimationController.h" #include "CCScrollbarLayerImpl.h" -#include <wtf/CurrentTime.h> +#include "base/time.h" #if OS(ANDROID) #include "CCScrollbarAnimationControllerLinearFade.h" @@ -47,22 +47,22 @@ bool CCScrollbarAnimationController::animate(double) void CCScrollbarAnimationController::didPinchGestureBegin() { - didPinchGestureBeginAtTime(monotonicallyIncreasingTime()); + didPinchGestureBeginAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } void CCScrollbarAnimationController::didPinchGestureUpdate() { - didPinchGestureUpdateAtTime(monotonicallyIncreasingTime()); + didPinchGestureUpdateAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } void CCScrollbarAnimationController::didPinchGestureEnd() { - didPinchGestureEndAtTime(monotonicallyIncreasingTime()); + didPinchGestureEndAtTime((base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } void CCScrollbarAnimationController::updateScrollOffset(CCLayerImpl* scrollLayer) { - updateScrollOffsetAtTime(scrollLayer, monotonicallyIncreasingTime()); + updateScrollOffsetAtTime(scrollLayer, (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()); } IntSize CCScrollbarAnimationController::getScrollLayerBounds(const CCLayerImpl* scrollLayer) |