summaryrefslogtreecommitdiffstats
path: root/ui/views/view_unittest.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 01:14:48 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 01:14:48 +0000
commit222c84bf2c650b7f7afeaef5bfbd0bc738ac8d81 (patch)
treec88710014878fe870eb3696764c0706986b3ed39 /ui/views/view_unittest.cc
parent11c50f80822afbb9dfabadbd521fdb4e454ad1ca (diff)
downloadchromium_src-222c84bf2c650b7f7afeaef5bfbd0bc738ac8d81.zip
chromium_src-222c84bf2c650b7f7afeaef5bfbd0bc738ac8d81.tar.gz
chromium_src-222c84bf2c650b7f7afeaef5bfbd0bc738ac8d81.tar.bz2
layers: Consolidate the ownership of layers in views::View and aura::Window.
BUG=none TEST=aura_unittests, views_unittests. Review URL: https://chromiumcodereview.appspot.com/10412044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_unittest.cc')
-rw-r--r--ui/views/view_unittest.cc16
1 files changed, 16 insertions, 0 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 3ebd39e..2e32f63 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -3160,6 +3160,22 @@ TEST_F(ViewLayerTest, ReorderUnderWidget) {
EXPECT_EQ(c2->layer(), parent_layer->children()[0]);
}
+// Verifies that the layer of a view can be acquired properly.
+TEST_F(ViewLayerTest, AcquireLayer) {
+ View* content = new View;
+ widget()->SetContentsView(content);
+ View* c1 = new View;
+ c1->SetPaintToLayer(true);
+ EXPECT_TRUE(c1->layer());
+ content->AddChildView(c1);
+
+ scoped_ptr<ui::Layer> layer(c1->AcquireLayer());
+ EXPECT_EQ(layer.get(), c1->layer());
+
+ layer.reset(c1->RecreateLayer());
+ EXPECT_NE(c1->layer(), layer.get());
+}
+
#endif // USE_AURA
} // namespace views