diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 06:59:23 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 06:59:23 +0000 |
| commit | 2593e60731d28e163f3f8a279530a97ab8055b92 (patch) | |
| tree | 696f4b8659f5610e9d029d0e1bddb04e1dcc4f57 /cc/scrollbar_animation_controller.cc | |
| parent | e22495903bd60a251c8cad8abc5302d22c095c17 (diff) | |
| download | chromium_src-2593e60731d28e163f3f8a279530a97ab8055b92.zip chromium_src-2593e60731d28e163f3f8a279530a97ab8055b92.tar.gz chromium_src-2593e60731d28e163f3f8a279530a97ab8055b92.tar.bz2 | |
Remove wtf/CurrentTime.h and uses from LayerTextureUpdaters and ScrollbarAnimationController in cc
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11190064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162952 0039d316-1c4b-4281-b951-d872f2087c98
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) |