| Index: cc/trees/thread_proxy.cc
|
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
|
| index 429b587a8adea723037dbd54dde59c72a48815f6..f5496f846f50cf32d90450e0243e45943488b30d 100644
|
| --- a/cc/trees/thread_proxy.cc
|
| +++ b/cc/trees/thread_proxy.cc
|
| @@ -107,7 +107,6 @@ ThreadProxy::CompositorThreadOnly::CompositorThreadOnly(
|
| next_frame_is_newly_committed_frame(false),
|
| inside_draw(false),
|
| input_throttled_until_commit(false),
|
| - did_commit_after_animating(false),
|
| smoothness_priority_expiration_notifier(
|
| proxy->ImplThreadTaskRunner(),
|
| base::Bind(&ThreadProxy::RenewTreePriority, base::Unretained(proxy)),
|
| @@ -937,7 +936,6 @@ void ThreadProxy::ScheduledActionAnimate() {
|
| impl().animation_time =
|
| impl().layer_tree_host_impl->CurrentBeginFrameArgs().frame_time;
|
| impl().layer_tree_host_impl->Animate(impl().animation_time);
|
| - impl().did_commit_after_animating = false;
|
| }
|
|
|
| void ThreadProxy::ScheduledActionCommit() {
|
| @@ -951,8 +949,6 @@ void ThreadProxy::ScheduledActionCommit() {
|
| impl().current_resource_update_controller->Finalize();
|
| impl().current_resource_update_controller = nullptr;
|
|
|
| - impl().did_commit_after_animating = true;
|
| -
|
| blocked_main().main_thread_inside_commit = true;
|
| impl().layer_tree_host_impl->BeginCommit();
|
| layer_tree_host()->BeginCommitOnImplThread(impl().layer_tree_host_impl.get());
|
| @@ -1020,11 +1016,6 @@ DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) {
|
| impl().timing_history.DidStartDrawing();
|
| base::AutoReset<bool> mark_inside(&impl().inside_draw, true);
|
|
|
| - if (impl().did_commit_after_animating) {
|
| - impl().layer_tree_host_impl->Animate(impl().animation_time);
|
| - impl().did_commit_after_animating = false;
|
| - }
|
| -
|
| if (impl().layer_tree_host_impl->pending_tree())
|
| impl().layer_tree_host_impl->pending_tree()->UpdateDrawProperties();
|
|
|
|
|