Chromium Code Reviews| Index: content/browser/loader/resource_dispatcher_host_impl.cc |
| diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc |
| index f63b7cf8679baee8b0b0d3bf6dab0496f1c12860..b5d8a43b870ab9444293502fa9266f9790e61204 100644 |
| --- a/content/browser/loader/resource_dispatcher_host_impl.cc |
| +++ b/content/browser/loader/resource_dispatcher_host_impl.cc |
| @@ -1407,12 +1407,9 @@ void ResourceDispatcherHostImpl::CancelTransferringNavigation( |
| void ResourceDispatcherHostImpl::ResumeDeferredNavigation( |
| const GlobalRequestID& id) { |
| ResourceLoader* loader = GetLoader(id); |
| - if (loader) { |
| - // The response we were meant to resume could have already been canceled. |
| - ResourceRequestInfoImpl* info = loader->GetRequestInfo(); |
| - if (info->cross_site_handler()) |
| - info->cross_site_handler()->ResumeResponse(); |
| - } |
| + // The response we were meant to resume could have already been canceled. |
| + if (loader) |
| + loader->CompleteTransfer(); |
|
Charlie Reis
2014/08/18 23:27:53
Note: We now only use this for transfers that end
nasko
2014/08/19 16:45:23
Converting to this doesn't remove the cross_site_h
Charlie Reis
2014/08/19 21:20:31
I think the sole difference is that we set loader-
|
| } |
| // The object died, so cancel and detach all requests associated with it except |