Remove WTF::currentTime() / WTF::monotonicallyIncreasingTime() uses from cc

These are implemented on top of WebKit::Platform via webkit_wtf_support and need
to go.

BUG=154451


Review URL: https://chromiumcodereview.appspot.com/11191068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164580 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index 1089e30..0cfecccc 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -12,7 +12,6 @@
 #include "cc/layer_tree_host.h"
 #include "cc/resource_update_controller.h"
 #include "cc/timer.h"
-#include <wtf/CurrentTime.h>
 
 namespace cc {
 
@@ -64,9 +63,9 @@ bool SingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect)
     return true;
 }
 
-void SingleThreadProxy::startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double duration)
+void SingleThreadProxy::startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, base::TimeDelta duration)
 {
-    m_layerTreeHostImpl->startPageScaleAnimation(targetPosition, useAnchor, scale, monotonicallyIncreasingTime(), duration);
+    m_layerTreeHostImpl->startPageScaleAnimation(targetPosition, useAnchor, scale, base::TimeTicks::Now(), duration);
 }
 
 void SingleThreadProxy::finishAllRendering()
@@ -276,7 +275,7 @@ void SingleThreadProxy::setNeedsCommitOnImplThread()
     m_layerTreeHost->scheduleComposite();
 }
 
-void SingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector> events, double wallClockTime)
+void SingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector> events, base::Time wallClockTime)
 {
     DCHECK(Proxy::isImplThread());
     DebugScopedSetMainThread main;
@@ -368,9 +367,7 @@ bool SingleThreadProxy::doComposite()
         if (!m_layerTreeHostImpl->visible())
             return false;
 
-        double monotonicTime = monotonicallyIncreasingTime();
-        double wallClockTime = currentTime();
-        m_layerTreeHostImpl->animate(monotonicTime, wallClockTime);
+        m_layerTreeHostImpl->animate(base::TimeTicks::Now(), base::Time::Now());
 
         // We guard prepareToDraw() with canDraw() because it always returns a valid frame, so can only
         // be used when such a frame is possible. Since drawLayers() depends on the result of