| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index 74b12ba5992a171adc92a96714f5960b49956c7e..0163175c8eba1a96063430dd722a36c5ca656edb 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -106,7 +106,6 @@ class LayerTreeHostImplTimeSourceAdapter : public TimeSourceClient {
|
| new DebugScopedSetImplThread(layer_tree_host_impl_->proxy()));
|
| }
|
|
|
| - // TODO(enne): This should probably happen post-animate.
|
| if (layer_tree_host_impl_->pending_tree()) {
|
| layer_tree_host_impl_->ActivatePendingTreeIfNeeded();
|
|
|
| @@ -1413,6 +1412,8 @@ void LayerTreeHostImpl::ActivatePendingTree() {
|
| root_layer_scroll_offset_delegate_);
|
| active_tree_->DidBecomeActive();
|
|
|
| + client_->DidActivatePendingTree();
|
| +
|
| // Reduce wasted memory now that unlinked resources are guaranteed not
|
| // to be used.
|
| client_->ReduceWastedContentsTextureMemoryOnImplThread();
|
| @@ -1429,8 +1430,6 @@ void LayerTreeHostImpl::ActivatePendingTree() {
|
| stats.total_paint_time + stats.total_record_time +
|
| stats.total_rasterize_time_for_now_bins_on_pending_tree);
|
| }
|
| -
|
| - client_->DidActivatePendingTree();
|
| }
|
|
|
| void LayerTreeHostImpl::SetVisible(bool visible) {
|
|
|