| Index: cc/trees/single_thread_proxy.cc
|
| diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
|
| index 920dc15495abdb7be32b0ca26eb5abfb37e9cbbe..79370cb34c6fdb7f06ec68886f5319c76df3ec19 100644
|
| --- a/cc/trees/single_thread_proxy.cc
|
| +++ b/cc/trees/single_thread_proxy.cc
|
| @@ -716,12 +716,6 @@ DrawResult SingleThreadProxy::DoComposite(base::TimeTicks frame_begin_time,
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "461509 SingleThreadProxy::DoComposite5"));
|
| layer_tree_host_impl_->UpdateAnimationState(start_ready_animations);
|
| - // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
|
| - // is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile6(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "461509 SingleThreadProxy::DoComposite6"));
|
| - layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
|
|
|
| // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
|
| // is fixed.
|
| @@ -968,7 +962,7 @@ base::TimeDelta SingleThreadProxy::CommitToActivateDurationEstimate() {
|
| }
|
|
|
| void SingleThreadProxy::DidBeginImplFrameDeadline() {
|
| - layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
|
| + layer_tree_host_impl_->DidBeginImplFrameDeadline();
|
| }
|
|
|
| void SingleThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) {
|
|
|