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

Unified Diff: cc/test/layer_test_common.h

Issue 1811423002: SubtreeShouldBeSkipped uses information from property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows compile failure Created 4 years, 9 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/layer_test_common.h
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index a1904b98db7ec2200f4a9444662f8daba40a9b29..573ba64a75987542bf7c51f42b7c22520e4cce1e 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -61,8 +61,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
T* ptr = layer.get();
- LayerImpl* root_layer_impl = host_->active_tree()->root_layer();
- root_layer_impl->AddChild(std::move(layer));
+ root_layer()->AddChild(std::move(layer));
return ptr;
}
@@ -89,8 +88,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a);
T* ptr = layer.get();
- LayerImpl* root_layer_impl = host_->active_tree()->root_layer();
- root_layer_impl->AddChild(std::move(layer));
+ root_layer()->AddChild(std::move(layer));
return ptr;
}
@@ -99,8 +97,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a, b);
T* ptr = layer.get();
- LayerImpl* root_layer_impl = host_->active_tree()->root_layer();
- root_layer_impl->AddChild(std::move(layer));
+ root_layer()->AddChild(std::move(layer));
return ptr;
}
@@ -109,8 +106,7 @@ class LayerTestCommon {
scoped_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
layer_impl_id_++, a, b, c, d);
T* ptr = layer.get();
- LayerImpl* root_layer_impl = host_->active_tree()->root_layer();
- root_layer_impl->AddChild(std::move(layer));
+ root_layer()->AddChild(std::move(layer));
return ptr;
}
@@ -128,8 +124,7 @@ class LayerTestCommon {
scoped_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
layer_impl_id_++, a, b, c, d, e);
T* ptr = layer.get();
- LayerImpl* root_layer_impl = host_->active_tree()->root_layer();
- root_layer_impl->AddChild(std::move(layer));
+ root_layer()->AddChild(std::move(layer));
return ptr;
}
@@ -155,7 +150,7 @@ class LayerTestCommon {
return host_->host_impl()->resource_provider();
}
LayerImpl* root_layer() const {
- return host_->host_impl()->active_tree()->root_layer();
+ return host_impl()->active_tree()->root_layer();
}
FakeLayerTreeHost* host() { return host_.get(); }
FakeLayerTreeHostImpl* host_impl() const { return host_->host_impl(); }

Powered by Google App Engine
This is Rietveld 408576698