| Index: cc/trees/layer_tree_host_unittest_copyrequest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_copyrequest.cc b/cc/trees/layer_tree_host_unittest_copyrequest.cc
|
| index 9db64850edf31f261c6f42997d342a2d5e10e2e2..fdce757279b6e833f03cd90f5655ef83531ccb22 100644
|
| --- a/cc/trees/layer_tree_host_unittest_copyrequest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_copyrequest.cc
|
| @@ -378,37 +378,37 @@ class LayerTreeHostCopyRequestTestInHiddenSubtree
|
| switch (callback_count_) {
|
| case 1:
|
| // Hide the copy request layer.
|
| - grand_parent_layer_->SetHideLayerAndSubtree(false);
|
| - parent_layer_->SetHideLayerAndSubtree(false);
|
| - copy_layer_->SetHideLayerAndSubtree(true);
|
| + grand_parent_layer_->SetOpacity(1.f);
|
| + parent_layer_->SetOpacity(1.f);
|
| + copy_layer_->SetOpacity(0.f);
|
| AddCopyRequest(copy_layer_.get());
|
| break;
|
| case 2:
|
| // Hide the copy request layer's parent only.
|
| - grand_parent_layer_->SetHideLayerAndSubtree(false);
|
| - parent_layer_->SetHideLayerAndSubtree(true);
|
| - copy_layer_->SetHideLayerAndSubtree(false);
|
| + grand_parent_layer_->SetOpacity(1.f);
|
| + parent_layer_->SetOpacity(0.f);
|
| + copy_layer_->SetOpacity(1.f);
|
| AddCopyRequest(copy_layer_.get());
|
| break;
|
| case 3:
|
| // Hide the copy request layer's grand parent only.
|
| - grand_parent_layer_->SetHideLayerAndSubtree(true);
|
| - parent_layer_->SetHideLayerAndSubtree(false);
|
| - copy_layer_->SetHideLayerAndSubtree(false);
|
| + grand_parent_layer_->SetOpacity(0.f);
|
| + parent_layer_->SetOpacity(1.f);
|
| + copy_layer_->SetOpacity(1.f);
|
| AddCopyRequest(copy_layer_.get());
|
| break;
|
| case 4:
|
| // Hide the copy request layer's parent and grandparent.
|
| - grand_parent_layer_->SetHideLayerAndSubtree(true);
|
| - parent_layer_->SetHideLayerAndSubtree(true);
|
| - copy_layer_->SetHideLayerAndSubtree(false);
|
| + grand_parent_layer_->SetOpacity(0.f);
|
| + parent_layer_->SetOpacity(0.f);
|
| + copy_layer_->SetOpacity(1.f);
|
| AddCopyRequest(copy_layer_.get());
|
| break;
|
| case 5:
|
| // Hide the copy request layer as well as its parent and grandparent.
|
| - grand_parent_layer_->SetHideLayerAndSubtree(true);
|
| - parent_layer_->SetHideLayerAndSubtree(true);
|
| - copy_layer_->SetHideLayerAndSubtree(true);
|
| + grand_parent_layer_->SetOpacity(0.f);
|
| + parent_layer_->SetOpacity(0.f);
|
| + copy_layer_->SetOpacity(0.f);
|
| AddCopyRequest(copy_layer_.get());
|
| break;
|
| case 6:
|
| @@ -439,7 +439,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest
|
|
|
| grand_parent_layer_ = FakePictureLayer::Create(layer_settings(), &client_);
|
| grand_parent_layer_->SetBounds(gfx::Size(15, 15));
|
| - grand_parent_layer_->SetHideLayerAndSubtree(true);
|
| + grand_parent_layer_->SetOpacity(0.f);
|
| root_->AddChild(grand_parent_layer_);
|
|
|
| // parent_layer_ owns a render surface.
|
| @@ -1162,8 +1162,8 @@ class LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest
|
|
|
| child_ = FakePictureLayer::Create(layer_settings(), &client_);
|
| child_->SetBounds(gfx::Size(10, 10));
|
| + child_->SetOpacity(0.f);
|
| root->AddChild(child_);
|
| - child_->SetHideLayerAndSubtree(true);
|
|
|
| layer_tree_host()->SetRootLayer(root);
|
| LayerTreeHostCopyRequestTest::SetupTree();
|
|
|