summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 19:23:33 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 19:23:33 +0000
commit0fbfa97be52934dffabd9998f6b38daf9efa2dcd (patch)
treef77987b0c09965a3c30a6f90a6470fa29c8cc72a /ash/wm
parent6df4ab90fa691851662bd8fd80b167cda56972fc (diff)
downloadchromium_src-0fbfa97be52934dffabd9998f6b38daf9efa2dcd.zip
chromium_src-0fbfa97be52934dffabd9998f6b38daf9efa2dcd.tar.gz
chromium_src-0fbfa97be52934dffabd9998f6b38daf9efa2dcd.tar.bz2
Fixes use after free caused by delete in RootWindowController (2)
RootWindowController::CloseChildWindows() was explicitly deleting windows. It should only do that for windows that are owned by the parent, otherwise the window should be removed. BUG=297028 TEST=covered by test now. R=oshima@chromium.org TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/25736004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/frame_painter.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index f92bc0b..3368001 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -177,8 +177,6 @@ bool IsSoloWindowHeaderCandidate(aura::Window* window) {
// a transparent solo-window header.
std::vector<Window*> GetWindowsForSoloHeaderUpdate(RootWindow* root_window) {
std::vector<Window*> windows;
- // During shutdown there may not be a workspace controller. In that case
- // we don't care about updating any windows.
// Avoid memory allocations for typical window counts.
windows.reserve(16);
// Collect windows from the desktop.