Makes View::RecreateLayer() and Window::RecreateLayer() the same

ui/views/view_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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 3525 matching lines @@
   v->AddChildView(v2);
 
   // Test the initial z-order.
   const std::vector<ui::Layer*>& child_layers_pre = v->layer()->children();
   ASSERT_EQ(2u, child_layers_pre.size());
   EXPECT_EQ(v1->layer(), child_layers_pre[0]);
   EXPECT_EQ(v2->layer(), child_layers_pre[1]);
 
   scoped_ptr<ui::Layer> v1_old_layer(v1->RecreateLayer());
 
-  // Test the new layer order. |v1_old_layer| should be above the layers
+  // Test the new layer order. We expect: |v1| |v1_old_layer| |v2|.
   // for |v1| and |v2|.
   const std::vector<ui::Layer*>& child_layers_post = v->layer()->children();
   ASSERT_EQ(3u, child_layers_post.size());
   EXPECT_EQ(v1->layer(), child_layers_post[0]);
-  EXPECT_EQ(v2->layer(), child_layers_post[1]);
-  EXPECT_EQ(v1_old_layer, child_layers_post[2]);
+  EXPECT_EQ(v1_old_layer, child_layers_post[1]);
+  EXPECT_EQ(v2->layer(), child_layers_post[2]);
 }
 
 // Verify the z-order of the layers as a result of calling RecreateLayer when
 // the widget is the parent with the layer.
 TEST_F(ViewLayerTest, RecreateLayerZOrderWidgetParent) {
   View* v = new View();
   widget()->SetContentsView(v);
 
   View* v1 = new View();
   v1->SetPaintToLayer(true);
   v->AddChildView(v1);
   View* v2 = new View();
   v2->SetPaintToLayer(true);
   v->AddChildView(v2);
 
   ui::Layer* root_layer = GetRootLayer();
 
   // Test the initial z-order.
   const std::vector<ui::Layer*>& child_layers_pre = root_layer->children();
   ASSERT_EQ(2u, child_layers_pre.size());
   EXPECT_EQ(v1->layer(), child_layers_pre[0]);
   EXPECT_EQ(v2->layer(), child_layers_pre[1]);
 
   scoped_ptr<ui::Layer> v1_old_layer(v1->RecreateLayer());
 
-  // Test the new layer order. |v1_old_layer| should be above the layers
-  // for |v1| and |v2|.
+  // Test the new layer order. We expect: |v1| |v1_old_layer| |v2|.
   const std::vector<ui::Layer*>& child_layers_post = root_layer->children();
   ASSERT_EQ(3u, child_layers_post.size());
   EXPECT_EQ(v1->layer(), child_layers_post[0]);
-  EXPECT_EQ(v2->layer(), child_layers_post[1]);
-  EXPECT_EQ(v1_old_layer, child_layers_post[2]);
+  EXPECT_EQ(v1_old_layer, child_layers_post[1]);
+  EXPECT_EQ(v2->layer(), child_layers_post[2]);
+}
+
+// Verifies RecreateLayer() moves all Layers over, even those that don't have
+// a View.
+TEST_F(ViewLayerTest, RecreateLayerMovesNonViewChildren) {
+  View v;
+  v.SetPaintToLayer(true);
+  View child;
+  child.SetPaintToLayer(true);
+  v.AddChildView(&child);
+  ASSERT_TRUE(v.layer() != NULL);
+  ASSERT_EQ(1u, v.layer()->children().size());
+  EXPECT_EQ(v.layer()->children()[0], child.layer());
+
+  ui::Layer layer(ui::LAYER_NOT_DRAWN);
+  v.layer()->Add(&layer);
+  v.layer()->StackAtBottom(&layer);
+
+  scoped_ptr<ui::Layer> old_layer(v.RecreateLayer());
+
+  // All children should be moved from old layer to new layer.
+  ASSERT_TRUE(old_layer.get() != NULL);
+  EXPECT_TRUE(old_layer->children().empty());
+
+  // And new layer should have the two children.
+  ASSERT_TRUE(v.layer() != NULL);
+  ASSERT_EQ(2u, v.layer()->children().size());
+  EXPECT_EQ(v.layer()->children()[0], &layer);
+  EXPECT_EQ(v.layer()->children()[1], child.layer());
 }
 
 TEST_F(ViewTest, FocusableAssertions) {
   // View subclasses may change insets based on whether they are focusable,
   // which effects the preferred size. To avoid preferred size changing around
   // these Views need to key off the last value set to SetFocusable(), not
   // whether the View is focusable right now. For this reason it's important
   // that focusable() return the last value passed to SetFocusable and not
   // whether the View is focusable right now.
   TestView view;
@@ skipping 95 matching lines @@
     ASSERT_EQ("v5", ui::test::ChildLayerNamesAsString(*w2_layer));
     v5_layer = w2_layer->children()[0];
     ASSERT_EQ("v6", ui::test::ChildLayerNamesAsString(*v5_layer));
 
   }
   // The views and the widgets are destroyed when AuraTestHelper::TearDown()
   // destroys root_window().
 }
 
 }  // namespace views