diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 03:18:59 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 03:18:59 +0000 |
| commit | f0127ea90cd1556784d3242d350613d03fc85070 (patch) | |
| tree | dec746e60afce218fe062b129132697c53d31f7a /chrome | |
| parent | 333aaa9045305b2b29a9c57cbb9856b15ba6c185 (diff) | |
| download | chromium_src-f0127ea90cd1556784d3242d350613d03fc85070.zip chromium_src-f0127ea90cd1556784d3242d350613d03fc85070.tar.gz chromium_src-f0127ea90cd1556784d3242d350613d03fc85070.tar.bz2 | |
Revert r29418 as it caused a regression.
OnKillFocus() is being called during destruction, and tries to access a render_widget_host_ which has already been NULLed.
BUG=25290, 24248
TBR=jcampan
Review URL: http://codereview.chromium.org/308014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_win.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 5d58849..2ad63e5 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -630,12 +630,6 @@ void RenderWidgetHostViewWin::Destroy() { // triggering further destructions. The deletion of this is handled by // OnFinalMessage(); close_on_deactivate_ = false; - - // In case OnFinalMessage() does not get called before DestroyWindow() - // returns, make sure we don't try to access |render_widget_host_| later. - // http://crbug.com/24248 - render_widget_host_ = NULL; - DestroyWindow(); } @@ -1272,8 +1266,7 @@ LRESULT RenderWidgetHostViewWin::OnGetObject(UINT message, WPARAM wparam, } void RenderWidgetHostViewWin::OnFinalMessage(HWND window) { - if (render_widget_host_) - render_widget_host_->ViewDestroyed(); + render_widget_host_->ViewDestroyed(); delete this; } |