Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index ad96a04fe1f8fc9e247a00b52262901dc8c34f79..0f26a34c68d89947d15e59e19816a296689ac3a5 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -467,7 +467,7 @@ void ThreadProxy::SetNeedsCommitOnImplThread() { |
void ThreadProxy::PostAnimationEventsToMainThreadOnImplThread( |
scoped_ptr<AnimationEventsVector> events, |
- base::Time wall_clock_time) { |
+ base::TimeTicks clock_time) { |
TRACE_EVENT0("cc", |
"ThreadProxy::PostAnimationEventsToMainThreadOnImplThread"); |
DCHECK(IsImplThread()); |
@@ -476,7 +476,7 @@ void ThreadProxy::PostAnimationEventsToMainThreadOnImplThread( |
base::Bind(&ThreadProxy::SetAnimationEvents, |
main_thread_weak_ptr_, |
base::Passed(&events), |
- wall_clock_time)); |
+ clock_time)); |
} |
bool ThreadProxy::ReduceContentsTextureMemoryOnImplThread(size_t limit_bytes, |
@@ -1136,14 +1136,10 @@ DrawSwapReadbackResult ThreadProxy::DrawSwapReadbackInternal( |
else |
monotonic_time = impl().layer_tree_host_impl->CurrentFrameTimeTicks(); |
- // TODO(ajuma): Remove wall_clock_time once the legacy implementation of |
- // animations in Blink is removed. |
- base::Time wall_clock_time = impl().layer_tree_host_impl->CurrentFrameTime(); |
- |
// TODO(enne): This should probably happen post-animate. |
if (impl().layer_tree_host_impl->pending_tree()) |
impl().layer_tree_host_impl->pending_tree()->UpdateDrawProperties(); |
- impl().layer_tree_host_impl->Animate(monotonic_time, wall_clock_time); |
+ impl().layer_tree_host_impl->Animate(monotonic_time); |
// This method is called on a forced draw, regardless of whether we are able |
// to produce a frame, as the calling site on main thread is blocked until its |
@@ -1403,12 +1399,12 @@ void ThreadProxy::DidCompleteSwapBuffers() { |
} |
void ThreadProxy::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, |
- base::Time wall_clock_time) { |
+ base::TimeTicks clock_time) { |
TRACE_EVENT0("cc", "ThreadProxy::SetAnimationEvents"); |
DCHECK(IsMainThread()); |
if (!layer_tree_host()) |
return; |
- layer_tree_host()->SetAnimationEvents(events.Pass(), wall_clock_time); |
+ layer_tree_host()->SetAnimationEvents(events.Pass(), clock_time); |
} |
void ThreadProxy::CreateAndInitializeOutputSurface() { |