| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index dcd4cf679b74500ee3ad7fa901d675f6700de710..b57e766de7018c2829679d4c29c89d79eacd3682 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -328,12 +328,12 @@ void SingleThreadProxy::SetNeedsCommitOnImplThread() {
|
|
|
| void SingleThreadProxy::PostAnimationEventsToMainThreadOnImplThread(
|
| scoped_ptr<AnimationEventsVector> events,
|
| - base::Time wall_clock_time) {
|
| + base::TimeTicks clock_time) {
|
| TRACE_EVENT0(
|
| "cc", "SingleThreadProxy::PostAnimationEventsToMainThreadOnImplThread");
|
| DCHECK(Proxy::IsImplThread());
|
| DebugScopedSetMainThread main(this);
|
| - layer_tree_host_->SetAnimationEvents(events.Pass(), wall_clock_time);
|
| + layer_tree_host_->SetAnimationEvents(events.Pass(), clock_time);
|
| }
|
|
|
| bool SingleThreadProxy::ReduceContentsTextureMemoryOnImplThread(
|
| @@ -532,8 +532,7 @@ bool SingleThreadProxy::DoComposite(
|
| }
|
|
|
| layer_tree_host_impl_->Animate(
|
| - layer_tree_host_impl_->CurrentFrameTimeTicks(),
|
| - layer_tree_host_impl_->CurrentFrameTime());
|
| + layer_tree_host_impl_->CurrentFrameTimeTicks());
|
| UpdateBackgroundAnimateTicking();
|
|
|
| if (!layer_tree_host_impl_->IsContextLost()) {
|
|
|