Make Aura and compositor stacking methods more intuitive.

ui/aura/window_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 "ui/aura/window.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 253 matching lines @@
 
   parent.StackChildAtTop(&child1);
   ASSERT_EQ(2u, parent.children().size());
   EXPECT_EQ(&child1, parent.children()[1]);
   EXPECT_EQ(&child2, parent.children()[0]);
   ASSERT_EQ(2u, parent.layer()->children().size());
   EXPECT_EQ(child1.layer(), parent.layer()->children()[1]);
   EXPECT_EQ(child2.layer(), parent.layer()->children()[0]);
 }
 
-// Various assertions for StackAtTop.
-TEST_F(WindowTest, StackAtTop) {
+// Various assertions for StackChildAbove.
+TEST_F(WindowTest, StackChildAbove) {
   Window parent(NULL);
   parent.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child1(NULL);
   child1.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child2(NULL);
   child2.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
   Window child3(NULL);
   child3.Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
 
   child1.SetParent(&parent);
@@ skipping 14 matching lines @@
   parent.StackChildAbove(&child2, &child1);
   ASSERT_EQ(3u, parent.children().size());
   EXPECT_EQ(&child1, parent.children()[0]);
   EXPECT_EQ(&child2, parent.children()[1]);
   EXPECT_EQ(&child3, parent.children()[2]);
   ASSERT_EQ(3u, parent.layer()->children().size());
   EXPECT_EQ(child1.layer(), parent.layer()->children()[0]);
   EXPECT_EQ(child2.layer(), parent.layer()->children()[1]);
   EXPECT_EQ(child3.layer(), parent.layer()->children()[2]);
 
-  // Move 1 in front of 3, resulting in [2 3 1].
+  // Move 1 in front of 3, resulting in [2, 3, 1].
   parent.StackChildAbove(&child1, &child3);
   ASSERT_EQ(3u, parent.children().size());
   EXPECT_EQ(&child2, parent.children()[0]);
   EXPECT_EQ(&child3, parent.children()[1]);
   EXPECT_EQ(&child1, parent.children()[2]);
   ASSERT_EQ(3u, parent.layer()->children().size());
   EXPECT_EQ(child2.layer(), parent.layer()->children()[0]);
   EXPECT_EQ(child3.layer(), parent.layer()->children()[1]);
   EXPECT_EQ(child1.layer(), parent.layer()->children()[2]);
+
+  // Moving 1 in front of 2 should lower it, resulting in [2, 1, 3].
+  parent.StackChildAbove(&child1, &child2);
+  ASSERT_EQ(3u, parent.children().size());
+  EXPECT_EQ(&child2, parent.children()[0]);
+  EXPECT_EQ(&child1, parent.children()[1]);
+  EXPECT_EQ(&child3, parent.children()[2]);
+  ASSERT_EQ(3u, parent.layer()->children().size());
+  EXPECT_EQ(child2.layer(), parent.layer()->children()[0]);
+  EXPECT_EQ(child1.layer(), parent.layer()->children()[1]);
+  EXPECT_EQ(child3.layer(), parent.layer()->children()[2]);
 }
 
 // Various destruction assertions.
 TEST_F(WindowTest, CaptureTests) {
   aura::Desktop* desktop = aura::Desktop::GetInstance();
   CaptureWindowDelegateImpl delegate;
   scoped_ptr<Window> window(CreateTestWindowWithDelegate(
       &delegate, 0, gfx::Rect(0, 0, 20, 20), NULL));
   EXPECT_FALSE(window->HasCapture());
 
@@ skipping 756 matching lines @@
 
   w3->Activate();
   EXPECT_EQ(w2.get(), active());
 
   w1->Activate();
   EXPECT_EQ(w1.get(), active());
 }
 
 }  // namespace test
 }  // namespace aura