summaryrefslogtreecommitdiffstats
path: root/ui/oak/oak_window.cc
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-29 09:27:47 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-29 09:27:47 +0000
commit3aff5e496ca118e8b1975899175d5fb5a67bb021 (patch)
treec8153131e5de4bd46099d9569c3eb6ef08eb173d /ui/oak/oak_window.cc
parent11409f2ac727969d30faf891d759f4957cb85621 (diff)
downloadchromium_src-3aff5e496ca118e8b1975899175d5fb5a67bb021.zip
chromium_src-3aff5e496ca118e8b1975899175d5fb5a67bb021.tar.gz
chromium_src-3aff5e496ca118e8b1975899175d5fb5a67bb021.tar.bz2
Revert 179231 as it has introduced a large number of memory leaks to ash_unittests
BUG=172842 > views: Fix a Widget destruction crash. > > For WIDGET_OWNS_NATIVE_WIDGET widget, we destroy root view before we delete > |native_widget_|. If a WidgetDelegateView is in root view's hierarchy, the > native widget destruction would crash because |widget_delegate_| is accessed > in OnNativeWidgetDestroying but it is deleted with root view already. > > This CL marks WidgetDelegateView as owned by client so that it does not go > away with the root view hierarchy and be deleted on DeleteDelegate. > > BUG=164791 > TEST=Covered with a new unit test. > > R=ben@chromium.org > > > Review URL: https://chromiumcodereview.appspot.com/11953066 TBR=xiyuan@chromium.org Review URL: https://codereview.chromium.org/12084041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/oak/oak_window.cc')
-rw-r--r--ui/oak/oak_window.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/oak/oak_window.cc b/ui/oak/oak_window.cc
index 7cf7dff..832a7a9 100644
--- a/ui/oak/oak_window.cc
+++ b/ui/oak/oak_window.cc
@@ -68,7 +68,6 @@ bool OakWindow::ShouldShowWindowIcon() const {
void OakWindow::DeleteDelegate() {
instance = NULL;
- delete this;
}
////////////////////////////////////////////////////////////////////////////////