diff options
| author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-22 00:38:04 +0000 |
|---|---|---|
| committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-22 00:38:04 +0000 |
| commit | ea9480ce469eb1db023c99b8af8e58f3d113b8d2 (patch) | |
| tree | 71c29f5f33738bce7f632b63486d038ab6a53c27 /chrome | |
| parent | 7a1c5ab3654723cfe4489e6981dcd67da1489f3f (diff) | |
| download | chromium_src-ea9480ce469eb1db023c99b8af8e58f3d113b8d2.zip chromium_src-ea9480ce469eb1db023c99b8af8e58f3d113b8d2.tar.gz chromium_src-ea9480ce469eb1db023c99b8af8e58f3d113b8d2.tar.bz2 | |
Back out r5252 temporarily to see if it is related to the
crash in ResourceDispatcherHost::OnReadCompleted.
R=eroman
BUG=b/1498134
Review URL: http://codereview.chromium.org/11584
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/resource_dispatcher_host.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/resource_dispatcher_host.cc b/chrome/browser/resource_dispatcher_host.cc index 6f1aba3..c68c5da 100644 --- a/chrome/browser/resource_dispatcher_host.cc +++ b/chrome/browser/resource_dispatcher_host.cc @@ -1747,16 +1747,7 @@ void ResourceDispatcherHost::CancelRequest(int render_process_host_id, info->login_handler->OnRequestCancelled(); info->login_handler = NULL; } - if (!i->second->is_pending()) { - // No io is pending, canceling the request won't notify us of anything, - // so we explicitly remove it. - // TODO: removing the request in this manner means we're not notifying - // anyone. We need make sure the event handlers and others are notified - // so that everything is cleaned up properly. - RemovePendingRequest(info->render_process_host_id, info->request_id); - } else { - i->second->Cancel(); - } + i->second->Cancel(); } // Do not remove from the pending requests, as the request will still |