diff options
| author | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 20:39:10 +0000 |
|---|---|---|
| committer | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 20:39:10 +0000 |
| commit | 3216d9ba903c585c3229a1cce9392c28672bee31 (patch) | |
| tree | 3ecca65fe43f6acf2a7c7ace8751828eb16b60fd /content | |
| parent | 5d910f5a95b6aa3e15bd27428b2907360e51b9f5 (diff) | |
| download | chromium_src-3216d9ba903c585c3229a1cce9392c28672bee31.zip chromium_src-3216d9ba903c585c3229a1cce9392c28672bee31.tar.gz chromium_src-3216d9ba903c585c3229a1cce9392c28672bee31.tar.bz2 | |
Browser Plugin: Fix crash on closing Browser App
BUG=180218
Test=manually
TBR=fsamuel@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12425007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index a53e32a..67e6459 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -106,9 +106,6 @@ BrowserPlugin::BrowserPlugin( } BrowserPlugin::~BrowserPlugin() { - // Will be a no-op if we are not currently locked to. - render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(this); - // If the BrowserPlugin has never navigated then the browser process and // BrowserPluginManager don't know about it and so there is nothing to do // here. @@ -1080,6 +1077,9 @@ void BrowserPlugin::destroy() { container_ = NULL; if (compositing_helper_) compositing_helper_->OnContainerDestroy(); + // Will be a no-op if the mouse is not currently locked. + if (render_view_) + render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(this); MessageLoop::current()->DeleteSoon(FROM_HERE, this); } |