From 69568e550fa0ce568787464aaea6c8a2fe150cd8 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Thu, 20 Jun 2013 23:05:22 +0000 Subject: Revert 207508 "Add a hide_layer_and_subtree() flag to cc::Layer" > Add a hide_layer_and_subtree() flag to cc::Layer > > This flag does what it says. We can use this flag to simplify ui::Layer > as it was recursively calling SetIsDrawable() instead, and now can just > SetHideLayerAndSubtree() on a single layer. > > This flag is needed to allow readbacks of layers that are have hidden > visibility (possibly due to an ancestor). > > Tests: > LayerTest.CheckPropertyChangeCausesCorrectBehavior > LayerImplTest.VerifyLayerChangesAreTrackedProperly > LayerTreeHostCommonTest.SubtreeHidden_SingleLayer > LayerTreeHostCommonTest.SubtreeHidden_SingleLayerImpl > LayerTreeHostCommonTest.SubtreeHidden_TwoLayers > LayerTreeHostCommonTest.SubtreeHidden_TwoLayersImpl > > R=enne, piman > BUG=242572 > > Review URL: https://chromiumcodereview.appspot.com/16896017 reveting this because this broke login screen on cros. (crbug.com/252494) TBR=danakj@chromium.org Review URL: https://codereview.chromium.org/17279011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207627 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/compositor/layer_unittest.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'ui/compositor/layer_unittest.cc') 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. -- cgit v1.1