diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 19:40:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 19:40:53 +0000 |
| commit | b26faa20a9af66108bb57a8983a172faa5fb8543 (patch) | |
| tree | f2e33dc51b9da805e8da4393f15835353cdf3656 /chrome | |
| parent | d052efbfce1429c43668589263701bb599a634fa (diff) | |
| download | chromium_src-b26faa20a9af66108bb57a8983a172faa5fb8543.zip chromium_src-b26faa20a9af66108bb57a8983a172faa5fb8543.tar.gz chromium_src-b26faa20a9af66108bb57a8983a172faa5fb8543.tar.bz2 | |
Cancel all pending requests when a worker goes away.
BUG=14753
Review URL: http://codereview.chromium.org/140039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/plugin_process_host.cc | 4 | ||||
| -rw-r--r-- | chrome/common/child_process_host.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 5216755..437331c 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -291,10 +291,6 @@ PluginProcessHost::PluginProcessHost() } PluginProcessHost::~PluginProcessHost() { - // Cancel all requests for plugin process. - PluginService::GetInstance()->resource_dispatcher_host()-> - CancelRequestsForProcess(GetProcessId()); - #if defined(OS_WIN) // We erase HWNDs from the plugin_parent_windows_set_ when we receive a // notification that the window is being destroyed. If we don't receive this diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc index e7a987f..c2c925e 100644 --- a/chrome/common/child_process_host.cc +++ b/chrome/common/child_process_host.cc @@ -60,6 +60,8 @@ ChildProcessHost::ChildProcessHost( ChildProcessHost::~ChildProcessHost() { Singleton<ChildProcessList>::get()->remove(this); + resource_dispatcher_host_->CancelRequestsForProcess(GetProcessId()); + if (handle()) { watcher_.StopWatching(); ProcessWatcher::EnsureProcessTerminated(handle()); |