| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index d2f2b54eea1fd6252cab9294aab1fd3f09e03fde..44d6e09c5d3b23a0934d87b37c93b7fc15e0e6b3 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -523,15 +523,18 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
|
|
|
| TreeSynchronizer::PushLayerProperties(this, sync_tree);
|
|
|
| + // This must happen after synchronizing property trees and after push
|
| + // properties, which updates property tree indices, but before animation
|
| + // host pushes properties as animation host push properties can change
|
| + // Animation::InEffect and we want the old InEffect value for updating
|
| + // property tree scrolling and animation.
|
| + sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread();
|
| +
|
| TRACE_EVENT0("cc", "LayerTreeHost::AnimationHost::PushProperties");
|
| DCHECK(host_impl->animation_host());
|
| animation_host_->PushPropertiesTo(host_impl->animation_host());
|
| }
|
|
|
| - // This must happen after synchronizing property trees and after push
|
| - // properties, which updates property tree indices.
|
| - sync_tree->UpdatePropertyTreeScrollingAndAnimationFromMainThread();
|
| -
|
| // This must happen after synchronizing property trees and after pushing
|
| // properties, which updates the clobber_active_value flag.
|
| sync_tree->UpdatePropertyTreeScrollOffset(&property_trees_);
|
|
|