| Index: ui/compositor/layer_unittest.cc
|
| diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
|
| index c326d4a5ca71d1221144ceec0e23ee02fbfdb27b..0be8a0aa636d83f2f6c353ca53b33f7524bde8cb 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_TRUE(l1->cc_layer()->DrawsContent());
|
| - EXPECT_TRUE(l2->cc_layer()->DrawsContent());
|
| - EXPECT_TRUE(l3->cc_layer()->DrawsContent());
|
| + 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());
|
|
|
| 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_FALSE(l1->cc_layer()->DrawsContent());
|
| - EXPECT_FALSE(l2->cc_layer()->DrawsContent());
|
| - EXPECT_FALSE(l3->cc_layer()->DrawsContent());
|
| + 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());
|
|
|
| l3->SetVisible(false);
|
| EXPECT_FALSE(l1->IsDrawn());
|
| EXPECT_FALSE(l2->IsDrawn());
|
| EXPECT_FALSE(l3->IsDrawn());
|
| - EXPECT_FALSE(l1->cc_layer()->DrawsContent());
|
| - EXPECT_FALSE(l2->cc_layer()->DrawsContent());
|
| - EXPECT_FALSE(l3->cc_layer()->DrawsContent());
|
| + 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());
|
|
|
| l1->SetVisible(true);
|
| EXPECT_TRUE(l1->IsDrawn());
|
| EXPECT_TRUE(l2->IsDrawn());
|
| EXPECT_FALSE(l3->IsDrawn());
|
| - EXPECT_TRUE(l1->cc_layer()->DrawsContent());
|
| - EXPECT_TRUE(l2->cc_layer()->DrawsContent());
|
| - EXPECT_FALSE(l3->cc_layer()->DrawsContent());
|
| + 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());
|
| }
|
|
|
| // Checks that stacking-related methods behave as advertised.
|
|
|