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

Unified Diff: cc/test/fake_layer_tree_host.cc

Issue 2609243003: [NOT FOR REVIEW]
Patch Set: Created 3 years, 12 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 | « cc/test/fake_layer_tree_host.h ('k') | cc/trees/draw_property_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 acffdc50edc5e3d642ed0cc8829adfa72f8a3d93..31708dd7a80732889e8778547025e5a7b73942d7 100644
--- a/cc/test/fake_layer_tree_host.cc
+++ b/cc/test/fake_layer_tree_host.cc
@@ -102,7 +102,8 @@ void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; }
LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree());
- active_tree()->SetPropertyTrees(property_trees());
+ active_tree()->SetPropertyTrees(property_trees(),
+ test_property_trees_with_new_clip_tree());
TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(),
active_tree());
layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host());
@@ -128,7 +129,8 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() {
TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree());
- pending_tree()->SetPropertyTrees(property_trees());
+ pending_tree()->SetPropertyTrees(property_trees(),
+ test_property_trees_with_new_clip_tree());
TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(),
pending_tree());
layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host());
« no previous file with comments | « cc/test/fake_layer_tree_host.h ('k') | cc/trees/draw_property_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698