diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 18:56:43 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 18:56:43 +0000 |
| commit | 3085128ee0b77d67afc1c4f51c4fda569033d82c (patch) | |
| tree | 940dae0aa913c794ae447651f5e5da7783c8c7ce /content/shell | |
| parent | ee2020664ad8b9836ac6b4a68aeb25f5372907c5 (diff) | |
| download | chromium_src-3085128ee0b77d67afc1c4f51c4fda569033d82c.zip chromium_src-3085128ee0b77d67afc1c4f51c4fda569033d82c.tar.gz chromium_src-3085128ee0b77d67afc1c4f51c4fda569033d82c.tar.bz2 | |
[content shell] don't synchronously destroy the main window if a plugin crashed
WebContentsImpl doesn't expect to be deleted in the call to its
delegate, so we shouldn't.
BUG=247965
R=marja@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16738003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/webkit_test_controller.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index 2dd2fed..fa78a8b 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -338,7 +338,10 @@ void WebKitTestController::PluginCrashed(const base::FilePath& plugin_path, DCHECK(CalledOnValidThread()); printer_->AddErrorMessage( base::StringPrintf("#CRASHED - plugin (pid %d)", plugin_pid)); - DiscardMainWindow(); + base::MessageLoop::current()->PostTask( + FROM_HERE, + base::Bind(base::IgnoreResult(&WebKitTestController::DiscardMainWindow), + base::Unretained(this))); } void WebKitTestController::RenderViewCreated(RenderViewHost* render_view_host) { |