| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index ff2ea9004141b4df8e91fc3de8bef8b2fde96f11..7c47ee8961c9706890129766c3d63bc3b6e8a8c6 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -495,6 +495,7 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
|
| BeginFrameArgs begin_frame_args(BeginFrameArgs::Create(
|
| BEGINFRAME_FROM_HERE, frame_begin_time, base::TimeTicks(),
|
| BeginFrameArgs::DefaultInterval(), BeginFrameArgs::SYNCHRONOUS));
|
| + layer_tree_host_impl_->UpdateCurrentBeginFrameArgs(begin_frame_args);
|
| DoBeginMainFrame(begin_frame_args);
|
| DoCommit();
|
|
|
| @@ -520,6 +521,8 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
|
| // another draw will never be scheduled, so break remaining promises.
|
| layer_tree_host_impl_->active_tree()->BreakSwapPromises(
|
| SwapPromise::SWAP_FAILS);
|
| +
|
| + layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
|
| }
|
| }
|
|
|
| @@ -594,7 +597,6 @@ DrawResult SingleThreadProxy::DoComposite(base::TimeTicks frame_begin_time,
|
|
|
| bool start_ready_animations = draw_frame;
|
| layer_tree_host_impl_->UpdateAnimationState(start_ready_animations);
|
| - layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
|
|
|
| timing_history_.DidFinishDrawing();
|
| }
|
|
|