Chromium Code Reviews| Index: cc/trees/thread_proxy.cc |
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
| index 1eed641f22a3179e8f18a1f209b28a204831081a..36522e89da5ce51f97cc2e8aa3d806a11adb4334 100644 |
| --- a/cc/trees/thread_proxy.cc |
| +++ b/cc/trees/thread_proxy.cc |
| @@ -1059,11 +1059,6 @@ DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) { |
| base::TimeDelta draw_duration_estimate = DrawDurationEstimate(); |
| base::AutoReset<bool> mark_inside(&impl().inside_draw, true); |
| - if (impl().did_commit_after_animating) { |
| - impl().layer_tree_host_impl->Animate(impl().animation_time); |
|
danakj
2014/06/18 15:23:18
This change is not part of the CL description.
mithro-old
2014/07/02 05:39:50
This was from the CL this one was based on. It sho
|
| - impl().did_commit_after_animating = false; |
| - } |
| - |
| if (impl().layer_tree_host_impl->pending_tree()) |
| impl().layer_tree_host_impl->pending_tree()->UpdateDrawProperties(); |
| @@ -1089,8 +1084,7 @@ DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) { |
| } |
| if (draw_frame) { |
| - impl().layer_tree_host_impl->DrawLayers( |
| - &frame, impl().scheduler->LastBeginImplFrameTime()); |
| + impl().layer_tree_host_impl->DrawLayers(&frame); |
| result = DRAW_SUCCESS; |
| impl().animations_frozen_until_next_draw = false; |
| } else if (result == DRAW_ABORTED_CHECKERBOARD_ANIMATIONS && |