diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 00:19:40 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 00:19:40 +0000 |
| commit | 9e3df998ca7b1b1ea6d0d403d93b834bf847eb89 (patch) | |
| tree | 1a492352381007493b0a28c47a1ce8878eb0dbae /content/browser/plugin_process_host.cc | |
| parent | e7a811df79d970d7ccf17f5b8ae1980c57694521 (diff) | |
| download | chromium_src-9e3df998ca7b1b1ea6d0d403d93b834bf847eb89.zip chromium_src-9e3df998ca7b1b1ea6d0d403d93b834bf847eb89.tar.gz chromium_src-9e3df998ca7b1b1ea6d0d403d93b834bf847eb89.tar.bz2 | |
Revert 86517 - Don't terminate plugin processes from the browser during browser shutdown. This is to allow the plugins to
shutdown gracefully, i.e. NP_Shutdown gets called. To ensure that we handle the case of a hung plugin, we handle
the OnChannelError notification in the IPC message filter implementation in the plugin process and post a delayed
task to kill the process.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=48178
BUG=48178
Review URL: http://codereview.chromium.org/6992006
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/7065048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_process_host.cc')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 9d2e7d4..2e72f31 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -221,12 +221,6 @@ bool PluginProcessHost::Init(const webkit::npapi::WebPluginInfo& info, #endif cmd_line); - // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be - // called on the plugin. The plugin process exits when it receives the - // OnChannelError notification indicating that the browser plugin channel has - // been destroyed. - SetTerminateChildOnShutdown(false); - content::GetContentClient()->browser()->PluginProcessHostCreated(this); AddFilter(new ResolveProxyMsgHelper(NULL)); |