Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: cc/trees/layer_tree_host.cc

Issue 2090793002: cc: Fix property tree animation sync bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "TransformOperations" Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698