views: Some more layer change, and add/update some tests for layers.

views/view_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 27 matching lines @@
 
 #if defined(OS_WIN)
 #include "views/test/test_views_delegate.h"
 #endif
 #if defined(USE_AURA)
 #include "ui/aura/desktop.h"
 #endif
 
 using ::testing::_;
 
+namespace {
+
+// Returns true if |ancestor| is an ancestor of |layer|.
+bool LayerIsAncestor(const ui::Layer* ancestor, const ui::Layer* layer) {
+  while (layer && layer != ancestor)
+    layer = layer->parent();
+  return layer == ancestor;
+}
+
+}
+
 namespace views {
 
 typedef ViewsTestBase ViewTest;
 
 // A derived class for testing purpose.
 class TestView : public View {
  public:
   TestView() : View(), in_touch_sequence_(false) {}
   virtual ~TestView() {}
 
@@ skipping 2501 matching lines @@
   v1->AddChildView(v2);
   v2->SetPaintToLayer(true);
   ASSERT_TRUE(v2->layer() != NULL);
   EXPECT_EQ(gfx::Rect(30, 41, 40, 50), v2->layer()->bounds());
 
   v1->SetPosition(gfx::Point(25, 36));
   EXPECT_EQ(gfx::Rect(35, 47, 40, 50), v2->layer()->bounds());
 
   v2->SetPosition(gfx::Point(11, 12));
   EXPECT_EQ(gfx::Rect(36, 48, 40, 50), v2->layer()->bounds());
+
+  // Bounds of the layer should change even if the view is not invisible.
+  v1->SetVisible(false);
+  v1->SetPosition(gfx::Point(20, 30));
+  EXPECT_EQ(gfx::Rect(31, 42, 40, 50), v2->layer()->bounds());
+
+  v2->SetVisible(false);
+  v2->SetBounds(10, 11, 20, 30);
+  EXPECT_EQ(gfx::Rect(30, 41, 20, 30), v2->layer()->bounds());
 }
 
 // Makes sure a transform persists after toggling the visibility.
 TEST_F(ViewLayerTest, ToggleVisibilityWithTransform) {
   View* view = new View;
   ui::Transform transform;
   transform.SetScale(2.0f, 2.0f);
   view->SetTransform(transform);
   widget()->SetContentsView(view);
   EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
@@ skipping 18 matching lines @@
 
   View* parent = view->parent();
   parent->RemoveChildView(view);
   parent->AddChildView(view);
 
   EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
   ASSERT_TRUE(view->layer() != NULL);
   EXPECT_EQ(2.0f, view->layer()->transform().matrix().get(0, 0));
 }
 
-// Makes sure that layer persists after toggling the visibility.
+// Makes sure that layer visibility is correct after toggling View visibility.
 TEST_F(ViewLayerTest, ToggleVisibilityWithLayer) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
+  // The view isn't attached to a widget or a parent view yet. But it should
+  // still have a layer, but the layer should not be attached to the root
+  // layer.
   View* v1 = new View;
+  v1->SetPaintToLayer(true);
+  EXPECT_TRUE(v1->layer());
+  EXPECT_FALSE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
+                               v1->layer()));
+
+  // Once the view is attached to a widget, its layer should be attached to the
+  // root layer and visible.
   content_view->AddChildView(v1);
-  v1->SetPaintToLayer(true);
+  EXPECT_TRUE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
+                              v1->layer()));
+  EXPECT_TRUE(v1->layer()->IsDrawn());
+
+  v1->SetVisible(false);
+  EXPECT_FALSE(v1->layer()->IsDrawn());
 
   v1->SetVisible(true);
-  EXPECT_TRUE(v1->layer());
+  EXPECT_TRUE(v1->layer()->IsDrawn());
 
-  v1->SetVisible(false);
-  EXPECT_TRUE(v1->layer());
+  widget()->Hide();
+  EXPECT_FALSE(v1->layer()->IsDrawn());
 
-  v1->SetVisible(true);
-  EXPECT_TRUE(v1->layer());
+  widget()->Show();
+  EXPECT_TRUE(v1->layer()->IsDrawn());
 }
 
 // Test that a hole in a layer is correctly created regardless of whether
 // the opacity attribute is set before or after the layer is created.
 TEST_F(ViewLayerTest, ToggleOpacityWithLayer) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
   View* parent_view = new View;
   content_view->AddChildView(parent_view);
@@ skipping 76 matching lines @@
        gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 
   child_view->SetVisible(false);
   EXPECT_TRUE(parent_view->layer()->hole_rect().IsEmpty());
 
   child_view->SetVisible(true);
   EXPECT_EQ(
       gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 }
 
+// Tests that the layers in the subtree are orphaned after a View is removed
+// from the parent.
+TEST_F(ViewLayerTest, OrphanLayerAfterViewRemove) {
+  View* content_view = new View;
+  widget()->SetContentsView(content_view);
+
+  View* v1 = new View;
+  content_view->AddChildView(v1);
+
+  View* v2 = new View;
+  v1->AddChildView(v2);
+  v2->SetPaintToLayer(true);
+  EXPECT_TRUE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
+                              v2->layer()));
+  EXPECT_TRUE(v2->layer()->IsDrawn());
+
+  content_view->RemoveChildView(v1);
+  EXPECT_FALSE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
+                               v2->layer()));
+
+  // Reparent |v2|.
+  content_view->AddChildView(v2);
+  EXPECT_TRUE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
+                              v2->layer()));
+  EXPECT_TRUE(v2->layer()->IsDrawn());
+}
+
 // TODO(sky): reenable once focus issues are straightened out so that this
 // doesn't crash.
 TEST_F(ViewLayerTest, DISABLED_NativeWidgetView) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
   View* view = new View;
   content_view->AddChildView(view);
   view->SetBounds(10, 20, 300, 400);
 
   views_delegate().set_default_parent_view(view);
@@ skipping 70 matching lines @@
   // Make content_view have a dirty rect, paint the layers and make sure
   // PaintTrackingView is painted.
   content_view->layer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
   GetRootLayer()->DrawTree();
   EXPECT_TRUE(content_view->painted());
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views