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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2331983002: cc: Make LayerTreeHost a protected Layer member. (Closed)
Patch Set: settings Created 4 years, 3 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/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_serialization.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 5853905a6e2e4af346ed543516035335eaffd384..1ce4f979bb3ce77d89daa76fbf904a1918c77117 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -3222,32 +3222,32 @@ class LayerTreeHostTestLayersPushProperties : public LayerTreeHostTest {
++num_commits_;
// The scrollbar layer always needs to be pushed.
- if (root_->layer_tree_host()) {
+ if (root_->GetLayerTree()) {
EXPECT_FALSE(root_->GetLayerTree()->LayerNeedsPushPropertiesForTesting(
root_.get()));
}
- if (child2_->layer_tree_host()) {
+ if (child2_->GetLayerTree()) {
EXPECT_FALSE(child2_->GetLayerTree()->LayerNeedsPushPropertiesForTesting(
child2_.get()));
}
- if (leaf_always_pushing_layer_->layer_tree_host()) {
+ if (leaf_always_pushing_layer_->GetLayerTree()) {
EXPECT_TRUE(leaf_always_pushing_layer_->GetLayerTree()
->LayerNeedsPushPropertiesForTesting(
leaf_always_pushing_layer_.get()));
}
// child_ and grandchild_ don't persist their need to push properties.
- if (child_->layer_tree_host()) {
+ if (child_->GetLayerTree()) {
EXPECT_FALSE(child_->GetLayerTree()->LayerNeedsPushPropertiesForTesting(
child_.get()));
}
- if (grandchild_->layer_tree_host()) {
+ if (grandchild_->GetLayerTree()) {
EXPECT_FALSE(
grandchild_->GetLayerTree()->LayerNeedsPushPropertiesForTesting(
grandchild_.get()));
}
- if (other_root_->layer_tree_host()) {
+ if (other_root_->GetLayerTree()) {
EXPECT_FALSE(
other_root_->GetLayerTree()->LayerNeedsPushPropertiesForTesting(
other_root_.get()));
@@ -3346,7 +3346,7 @@ class LayerTreeHostTestLayersPushProperties : public LayerTreeHostTest {
}
// The leaf layer always pushes.
- if (leaf_always_pushing_layer_->layer_tree_host())
+ if (leaf_always_pushing_layer_->GetLayerTree())
++expected_push_properties_leaf_layer_;
}
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698