| 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 62c620643b95ac62fe7f252dd4d5915329f764f8..0d78c647e8817f3310c63487654de364d9313668 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -638,13 +638,13 @@ class LayerTreeHostTestPushPropertiesTo : public LayerTreeHostTest {
|
|
|
| void VerifyBeforeValues(Layer* layer) {
|
| EXPECT_EQ(gfx::Size(10, 10).ToString(), layer->bounds().ToString());
|
| - EXPECT_FALSE(layer->hide_layer_and_subtree());
|
| + EXPECT_NE(layer->opacity(), 0.f);
|
| EXPECT_FALSE(layer->DrawsContent());
|
| }
|
|
|
| void SetBeforeValues(Layer* layer) {
|
| layer->SetBounds(gfx::Size(10, 10));
|
| - layer->SetHideLayerAndSubtree(false);
|
| + layer->SetOpacity(1.f);
|
| layer->SetIsDrawable(false);
|
| }
|
|
|
| @@ -657,7 +657,7 @@ class LayerTreeHostTestPushPropertiesTo : public LayerTreeHostTest {
|
| EXPECT_EQ(gfx::Size(20, 20).ToString(), layer->bounds().ToString());
|
| break;
|
| case HIDE_LAYER_AND_SUBTREE:
|
| - EXPECT_TRUE(layer->hide_layer_and_subtree());
|
| + EXPECT_EQ(layer->opacity(), 0.f);
|
| break;
|
| case DRAWS_CONTENT:
|
| EXPECT_TRUE(layer->DrawsContent());
|
| @@ -674,7 +674,8 @@ class LayerTreeHostTestPushPropertiesTo : public LayerTreeHostTest {
|
| layer->SetBounds(gfx::Size(20, 20));
|
| break;
|
| case HIDE_LAYER_AND_SUBTREE:
|
| - layer->SetHideLayerAndSubtree(true);
|
| + // Set opacity to 0 to hide subtree.
|
| + layer->SetOpacity(0.f);
|
| break;
|
| case DRAWS_CONTENT:
|
| layer->SetIsDrawable(true);
|
|
|