diff options
Diffstat (limited to 'ui/compositor/layer_unittest.cc')
| -rw-r--r-- | ui/compositor/layer_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 0be8a0a..c326d4a 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -646,9 +646,9 @@ TEST_F(LayerWithNullDelegateTest, Visibility) { EXPECT_TRUE(l1->IsDrawn()); EXPECT_TRUE(l2->IsDrawn()); EXPECT_TRUE(l3->IsDrawn()); - EXPECT_FALSE(l1->cc_layer()->hide_layer_and_subtree()); - EXPECT_FALSE(l2->cc_layer()->hide_layer_and_subtree()); - EXPECT_FALSE(l3->cc_layer()->hide_layer_and_subtree()); + EXPECT_TRUE(l1->cc_layer()->DrawsContent()); + EXPECT_TRUE(l2->cc_layer()->DrawsContent()); + EXPECT_TRUE(l3->cc_layer()->DrawsContent()); compositor()->SetRootLayer(l1.get()); @@ -658,25 +658,25 @@ TEST_F(LayerWithNullDelegateTest, Visibility) { EXPECT_FALSE(l1->IsDrawn()); EXPECT_FALSE(l2->IsDrawn()); EXPECT_FALSE(l3->IsDrawn()); - EXPECT_TRUE(l1->cc_layer()->hide_layer_and_subtree()); - EXPECT_FALSE(l2->cc_layer()->hide_layer_and_subtree()); - EXPECT_FALSE(l3->cc_layer()->hide_layer_and_subtree()); + EXPECT_FALSE(l1->cc_layer()->DrawsContent()); + EXPECT_FALSE(l2->cc_layer()->DrawsContent()); + EXPECT_FALSE(l3->cc_layer()->DrawsContent()); l3->SetVisible(false); EXPECT_FALSE(l1->IsDrawn()); EXPECT_FALSE(l2->IsDrawn()); EXPECT_FALSE(l3->IsDrawn()); - EXPECT_TRUE(l1->cc_layer()->hide_layer_and_subtree()); - EXPECT_FALSE(l2->cc_layer()->hide_layer_and_subtree()); - EXPECT_TRUE(l3->cc_layer()->hide_layer_and_subtree()); + EXPECT_FALSE(l1->cc_layer()->DrawsContent()); + EXPECT_FALSE(l2->cc_layer()->DrawsContent()); + EXPECT_FALSE(l3->cc_layer()->DrawsContent()); l1->SetVisible(true); EXPECT_TRUE(l1->IsDrawn()); EXPECT_TRUE(l2->IsDrawn()); EXPECT_FALSE(l3->IsDrawn()); - EXPECT_FALSE(l1->cc_layer()->hide_layer_and_subtree()); - EXPECT_FALSE(l2->cc_layer()->hide_layer_and_subtree()); - EXPECT_TRUE(l3->cc_layer()->hide_layer_and_subtree()); + EXPECT_TRUE(l1->cc_layer()->DrawsContent()); + EXPECT_TRUE(l2->cc_layer()->DrawsContent()); + EXPECT_FALSE(l3->cc_layer()->DrawsContent()); } // Checks that stacking-related methods behave as advertised. |