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

Unified Diff: cc/test/fake_layer_tree_host.cc

Issue 2621403003: cc: Don't create SyncedPropety instances on the main thread. (Closed)
Patch Set: Created 3 years, 11 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
Index: cc/test/fake_layer_tree_host.cc
diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc
index 6756f98feebe83822399a0194fbde801867a941b..44d6299f396a01085e2a1e0cdadb2cbd8f86597e 100644
--- a/cc/test/fake_layer_tree_host.cc
+++ b/cc/test/fake_layer_tree_host.cc
@@ -108,7 +108,8 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
active_tree());
layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host());
- active_tree()->UpdatePropertyTreeScrollOffset(property_trees());
+ active_tree()->property_trees()->scroll_tree.PushScrollUpdatesFromMainThread(
+ property_trees(), active_tree());
if (layer_tree_->page_scale_layer() &&
layer_tree_->inner_viewport_scroll_layer()) {
@@ -134,7 +135,8 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() {
pending_tree());
layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host());
- pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());
+ pending_tree()->property_trees()->scroll_tree.PushScrollUpdatesFromMainThread(
+ property_trees(), pending_tree());
return pending_tree()->root_layer_for_testing();
}

Powered by Google App Engine
This is Rietveld 408576698