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

Unified Diff: cc/test/fake_layer_tree_host.cc

Issue 2159513003: Setup LayerTree class, refactor 2 functions from LayerTreeHost to it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add proto to gyp file and modify inproper comment. Created 4 years, 5 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 4d214fb9f535a4c73146ff5c2655397855f9ba1d..b112f13bd3db780439bddfaae22eb6b014ef42ae 100644
--- a/cc/test/fake_layer_tree_host.cc
+++ b/cc/test/fake_layer_tree_host.cc
@@ -87,8 +87,8 @@ void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; }
LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree());
active_tree()->SetPropertyTrees(property_trees());
- TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(),
- active_tree());
+ TreeSynchronizer::PushLayerProperties(
+ root_layer()->layer_tree_host()->GetLayerTree(), active_tree());
animation_host()->PushPropertiesTo(host_impl_.animation_host());
active_tree()->UpdatePropertyTreeScrollOffset(property_trees());
@@ -109,8 +109,8 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() {
TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree());
pending_tree()->SetPropertyTrees(property_trees());
- TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(),
- pending_tree());
+ TreeSynchronizer::PushLayerProperties(
+ root_layer()->layer_tree_host()->GetLayerTree(), pending_tree());
animation_host()->PushPropertiesTo(host_impl_.animation_host());
pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());

Powered by Google App Engine
This is Rietveld 408576698