Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1337)

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 464593003: Don't swap out the old RenderFrameHost until the new one commits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Major rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698