summaryrefslogtreecommitdiffstats
path: root/ui/wm
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 20:48:40 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 20:48:40 +0000
commitd5d82dd872f8bbc0284a9f366c99c7d654c3b070 (patch)
treeae0895e8e82b2f602788cbeddc0c2ebadf0ba535 /ui/wm
parent96aca4267772014b20e71b6874b106babf752a50 (diff)
downloadchromium_src-d5d82dd872f8bbc0284a9f366c99c7d654c3b070.zip
chromium_src-d5d82dd872f8bbc0284a9f366c99c7d654c3b070.tar.gz
chromium_src-d5d82dd872f8bbc0284a9f366c99c7d654c3b070.tar.bz2
Reset the window before its acquired layer is deleted
BUG=None TEST=This should be covered by memory bot. (valgrind/asan should catch this). I'll file a request to add wm_core_unittests to memory bots. R=sky@chromium.org Review URL: https://codereview.chromium.org/220813004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/wm')
-rw-r--r--ui/wm/core/window_util_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/wm/core/window_util_unittest.cc b/ui/wm/core/window_util_unittest.cc
index fb72371..35be225 100644
--- a/ui/wm/core/window_util_unittest.cc
+++ b/ui/wm/core/window_util_unittest.cc
@@ -45,5 +45,8 @@ TEST_F(WindowUtilTest, RecreateLayers) {
ASSERT_EQ(2u, window1->layer()->children().size());
EXPECT_EQ(window11->layer(), window1->layer()->children()[0]);
EXPECT_EQ(window12->layer(), window1->layer()->children()[1]);
+
+ // Delete the window before the acquired layer is deleted.
+ window11.reset();
}
} // namespace wm