diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 16:31:04 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 16:31:04 +0000 |
| commit | 686b24f5bdf166cca7595730d969ff72659570c2 (patch) | |
| tree | 020f43b8259f3404be36e1d2083f6c71cd18c281 /chrome/browser/debugger | |
| parent | 3acf5a57a0f4a68c45838e21bf928ee6760f8390 (diff) | |
| download | chromium_src-686b24f5bdf166cca7595730d969ff72659570c2.zip chromium_src-686b24f5bdf166cca7595730d969ff72659570c2.tar.gz chromium_src-686b24f5bdf166cca7595730d969ff72659570c2.tar.bz2 | |
Fix the asan fix.
ChromeRenderViewHostObserver needs the value of render_view_host when cleaning
up, but the user-after-free fix made render_view_host() always NULL in the dtor.
The previous fix was http://codereview.chromium.org/8354034/
TBR=jam@chromium.org
TEST=asan bots are happy
Review URL: http://codereview.chromium.org/8352049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/debugger/devtools_window.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 10a3dd1..e9d3dac 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -625,7 +625,7 @@ DevToolsWindow* DevToolsWindow::AsDevToolsWindow( return NULL; } -void DevToolsWindow::RenderViewHostDestroyed() { +void DevToolsWindow::RenderViewHostDestroyed(RenderViewHost* rvh) { // Don't delete |this| here, do it on NOTIFICATION_TAB_CLOSING event. } diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index afd903a..68715b6 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -121,7 +121,7 @@ class DevToolsWindow static DevToolsWindow* AsDevToolsWindow(DevToolsClientHost*); // RenderViewHostObserver overrides. - virtual void RenderViewHostDestroyed() OVERRIDE; + virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnActivateWindow(); |