Add a hide_layer_and_subtree() flag to cc::Layer

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 628 matching lines @@
 
   NullLayerDelegate delegate;
   l1->set_delegate(&delegate);
   l2->set_delegate(&delegate);
   l3->set_delegate(&delegate);
 
   // Layers should initially be drawn.
   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());
 
   Draw();
 
   l1->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_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.
 TEST_F(LayerWithNullDelegateTest, Stacking) {
   scoped_ptr<Layer> root(new Layer(LAYER_NOT_DRAWN));
   scoped_ptr<Layer> l1(new Layer(LAYER_TEXTURED));
   scoped_ptr<Layer> l2(new Layer(LAYER_TEXTURED));
   scoped_ptr<Layer> l3(new Layer(LAYER_TEXTURED));
   l1->set_name("1");
   l2->set_name("2");
@@ skipping 685 matching lines @@
   l1->SetOpacity(0.5f);
 
   // Change l1's cc::Layer.
   l1->SwitchCCLayerForTest();
 
   // Ensure that the opacity animation completed.
   EXPECT_FLOAT_EQ(l1->opacity(), 0.5f);
 }
 
 }  // namespace ui