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

Unified Diff: content/browser/renderer_host/resource_dispatcher_host.cc

Issue 7601011: Fix resource loads dropped when iframe is transferred to a new window and original window closes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix crash in tests (RenderThread::current() is NULL) Created 9 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/renderer_host/resource_dispatcher_host.cc
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 24ef6825bfd520b7177f8b5f97cb61a6294aaa40..64e45f337dd4dbeb7625fdac1e82e8da15aae910 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -338,6 +338,8 @@ bool ResourceDispatcherHost::OnMessageReceived(const IPC::Message& message,
IPC_MESSAGE_HANDLER(ResourceHostMsg_DataDownloaded_ACK, OnDataDownloadedACK)
IPC_MESSAGE_HANDLER(ResourceHostMsg_UploadProgress_ACK, OnUploadProgressACK)
IPC_MESSAGE_HANDLER(ResourceHostMsg_CancelRequest, OnCancelRequest)
+ IPC_MESSAGE_HANDLER(ResourceHostMsg_TransferRequestToNewPage,
+ OnTransferRequestToNewPage)
IPC_MESSAGE_HANDLER(ResourceHostMsg_FollowRedirect, OnFollowRedirect)
IPC_MESSAGE_HANDLER(ViewHostMsg_SwapOut_ACK, OnSwapOutACK)
IPC_MESSAGE_HANDLER(ViewHostMsg_DidLoadResourceFromMemoryCache,
@@ -634,6 +636,11 @@ void ResourceDispatcherHost::OnCancelRequest(int request_id) {
CancelRequest(filter_->child_id(), request_id, true);
}
+void ResourceDispatcherHost::OnTransferRequestToNewPage(const IPC::Message& msg,
+ int request_id) {
+ TransferRequestToNewPage(filter_->child_id(), msg.routing_id(), request_id);
+}
+
void ResourceDispatcherHost::OnFollowRedirect(
int request_id,
bool has_new_first_party_for_cookies,
@@ -1319,6 +1326,23 @@ void ResourceDispatcherHost::CancelRequest(int child_id,
}
}
+void ResourceDispatcherHost::TransferRequestToNewPage(int process_unique_id,
+ int new_routing_id,
+ int request_id) {
+ PendingRequestList::iterator i = pending_requests_.find(
+ GlobalRequestID(process_unique_id, request_id));
+ if (i == pending_requests_.end()) {
+ // We probably want to remove this warning eventually, but I wanted to be
+ // able to notice when this happens during initial development since it
+ // should be rare and may indicate a bug.
+ DLOG(WARNING) << "Updating a request that wasn't found";
+ return;
+ }
+ net::URLRequest* request = i->second;
+ ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
+ info->set_route_id(new_routing_id);
+}
+
bool ResourceDispatcherHost::CancelRequestInternal(net::URLRequest* request,
bool from_renderer) {
VLOG(1) << "CancelRequest: " << request->url().spec();

Powered by Google App Engine
This is Rietveld 408576698