Compute if a layer is drawn without LayerTree hierarchy

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 "ui/compositor/layer.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 709 matching lines @@
   scoped_ptr<Layer> l1(CreateLayer(LAYER_SOLID_COLOR));
   l1->SetFillsBoundsOpaquely(true);
   l1->SetForceRenderSurface(true);
   l1->SetVisible(false);
   l1->SetBounds(gfx::Rect(4, 5));
 
   EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin());
   EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent());
   EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque());
   EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface());
-  EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
   EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds());
 
   cc::Layer* before_layer = l1->cc_layer_for_testing();
 
   bool callback1_run = false;
   cc::TextureMailbox mailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0);
   l1->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
                                      base::Bind(ReturnMailbox, &callback1_run)),
                         gfx::Size(10, 10));
 
   EXPECT_NE(before_layer, l1->cc_layer_for_testing());
 
   EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin());
   EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent());
   EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque());
   EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface());
-  EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
   EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds());
   EXPECT_FALSE(callback1_run);
 
   bool callback2_run = false;
   mailbox = cc::TextureMailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0);
   l1->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
                                      base::Bind(ReturnMailbox, &callback2_run)),
                         gfx::Size(10, 10));
   EXPECT_TRUE(callback1_run);
   EXPECT_FALSE(callback2_run);
 
   // Show solid color instead.
   l1->SetShowSolidColorContent();
   EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin());
   EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent());
   EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque());
   EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface());
-  EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
   EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds());
   EXPECT_TRUE(callback2_run);
 
   before_layer = l1->cc_layer_for_testing();
 
   // Back to a texture, without changing the bounds of the layer or the texture.
   bool callback3_run = false;
   mailbox = cc::TextureMailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0);
   l1->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
                                      base::Bind(ReturnMailbox, &callback3_run)),
                         gfx::Size(10, 10));
 
   EXPECT_NE(before_layer, l1->cc_layer_for_testing());
 
   EXPECT_EQ(gfx::Point3F(), l1->cc_layer_for_testing()->transform_origin());
   EXPECT_TRUE(l1->cc_layer_for_testing()->DrawsContent());
   EXPECT_TRUE(l1->cc_layer_for_testing()->contents_opaque());
   EXPECT_TRUE(l1->cc_layer_for_testing()->force_render_surface());
-  EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
   EXPECT_EQ(gfx::Size(4, 5), l1->cc_layer_for_testing()->bounds());
   EXPECT_FALSE(callback3_run);
 
   // Release the on |l1| mailbox to clean up the test.
   l1->SetShowSolidColorContent();
 }
 
 // Various visibile/drawn assertions.
 TEST_F(LayerWithNullDelegateTest, Visibility) {
   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->Add(l2.get());
   l2->Add(l3.get());
 
   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_FALSE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_FALSE(l2->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_FALSE(l3->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_NE(l1->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_NE(l2->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_NE(l3->cc_layer_for_testing()->opacity(), 0.f);
 
   compositor()->SetRootLayer(l1.get());
 
   Draw();
 
   l1->SetVisible(false);
   EXPECT_FALSE(l1->IsDrawn());
   EXPECT_FALSE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
-  EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_FALSE(l2->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_FALSE(l3->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_NE(l2->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_NE(l3->cc_layer_for_testing()->opacity(), 0.f);
 
   l3->SetVisible(false);
   EXPECT_FALSE(l1->IsDrawn());
   EXPECT_FALSE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
-  EXPECT_TRUE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_FALSE(l2->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_TRUE(l3->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_NE(l2->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_EQ(l3->cc_layer_for_testing()->opacity(), 0.f);
 
   l1->SetVisible(true);
   EXPECT_TRUE(l1->IsDrawn());
   EXPECT_TRUE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
-  EXPECT_FALSE(l1->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_FALSE(l2->cc_layer_for_testing()->hide_layer_and_subtree());
-  EXPECT_TRUE(l3->cc_layer_for_testing()->hide_layer_and_subtree());
+  EXPECT_NE(l1->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_NE(l2->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_EQ(l3->cc_layer_for_testing()->opacity(), 0.f);
+}
+
+TEST_F(LayerWithNullDelegateTest, Opacity) {

[weiliangc, 2016/01/15 19:30:24]

Preferably with more descriptive test name.

[jaydasika, 2016/01/19 20:02:49]

Done.

+  scoped_ptr<Layer> l1(new Layer(LAYER_TEXTURED));
+
+  NullLayerDelegate delegate;
+  l1->set_delegate(&delegate);
+
+  // Initially, the layer should be fully opaque.
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 1.f);
+
+  compositor()->SetRootLayer(l1.get());
+
+  Draw();
+
+  // When a layer is invisble, the corresponding cc_layer should be completely
+  // transparent, but the ui layer should store the original opacity of cc
+  // layer.
+  l1->SetVisible(false);
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_EQ(l1->opacity(), 1.f);
+
+  // Any changes to opacity when the layer is invisble is cached by the  ui
+  // layer and set on the corresponding cc layer only when it becomes visible.
+  l1->SetOpacity(0.5f);
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
+  EXPECT_EQ(l1->opacity(), 0.5f);
+  l1->SetVisible(true);
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.5f);
+
+  // The original opacity should be restored when invisible layer becomes
+  // visible.
+  l1->SetOpacity(0.2f);
+  l1->SetVisible(false);
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.f);
+  l1->SetVisible(true);
+  EXPECT_EQ(l1->cc_layer_for_testing()->opacity(), 0.2f);
 }
 
 // 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 1028 matching lines @@
   root->SetOpacity(0.5f);
   WaitForSwap();
   EXPECT_EQ(1u, animation_observer.animation_step_count());
 
   EXPECT_FALSE(animation_observer.shutdown());
   ResetCompositor();
   EXPECT_TRUE(animation_observer.shutdown());
 }
 
 }  // namespace ui