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

Unified Diff: cc/layers/layer.cc

Issue 2873313004: Harmonize LayerTreeHost/LayerTreeHostImpl synchronization steps (Closed)
Patch Set: More harmonious Created 3 years, 7 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.h » ('j') | cc/trees/layer_tree_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 6845f0e111c893527bec976f40f4d929b911ae45..8b852b5af49b606f6f23cc9ece91448068f0ebad 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -1183,6 +1183,10 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
layer->set_user_scrollable_vertical(inputs_.user_scrollable_vertical);
layer->SetMutableProperties(inputs_.mutable_properties);
+ // The property trees must be safe to access because they will be used below
+ // to call |SetScrollOffsetClobberActiveValue|.
+ DCHECK(layer->layer_tree_impl()->PropertyTreeSyncComplete());
+
// When a scroll offset animation is interrupted the new scroll position on
// the pending tree will clobber any impl-side scrolling occuring on the
// active tree. To do so, avoid scrolling the pending tree along with it
« no previous file with comments | « no previous file | cc/trees/layer_tree_host.h » ('j') | cc/trees/layer_tree_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698