Fix resource loads dropped when iframe is transferred to a new window and original window closes.

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 #include "content/common/content_constants.h"
 #include "content/common/content_switches.h"
 #include "content/common/database_messages.h"
 #include "content/common/drag_messages.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_service.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/pepper_plugin_registry.h"
+#include "content/common/resource_dispatcher.h"
 #include "content/common/quota_dispatcher.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/mhtml_generator.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
@@ skipping 2560 matching lines @@
   didCommitProvisionalLoad(frame, is_new_navigation);
 
   WebDataSource* datasource = frame->view()->mainFrame()->dataSource();
   UpdateTitle(frame, datasource->pageTitle(), datasource->pageTitleDirection());
 }
 
 void RenderView::didUpdateCurrentHistoryItem(WebFrame* frame) {
   StartNavStateSyncTimerIfNecessary();
 }
 
+// Called by WebKit on new or transferred requests to introduce the request
+// to the RenderView. If this RenderView inherited a pending Request from other
+// RenderView (as in the case of reparenting an iframe via adoptNode() JS API),
+// we need to update routing information to point to this RenderView.
 void RenderView::assignIdentifierToRequest(
     WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
-  // Ignore
+  if (RenderThread::current())  // Will be NULL during tests.
+    RenderThread::current()->resource_dispatcher()->TransferRequestToNewPage(
+        identifier, routing_id_);
 }
 
 void RenderView::willSendRequest(
     WebFrame* frame, unsigned identifier, WebURLRequest& request,
     const WebURLResponse& redirect_response) {
   WebFrame* top_frame = frame->top();
   if (!top_frame)
     top_frame = frame;
   WebDataSource* provisional_data_source = top_frame->provisionalDataSource();
   WebDataSource* top_data_source = top_frame->dataSource();
@@ skipping 19 matching lines @@
 
   if (top_data_source) {
     NavigationState* state = NavigationState::FromDataSource(top_data_source);
     // TODO(gavinp): separate out prefetching and prerender field trials
     // if the rel=prerender rel type is sticking around.
     if (state && (request.targetType() == WebURLRequest::TargetIsPrefetch ||
                   request.targetType() == WebURLRequest::TargetIsPrerender))
       state->set_was_prefetcher(true);
   }
 
+  request.setIdentifier(identifier);
+
   request.setRequestorID(routing_id_);
   request.setHasUserGesture(frame->isProcessingUserGesture());
 
   if (!renderer_preferences_.enable_referrers)
     request.clearHTTPHeaderField("Referer");
 }
 
 void RenderView::didReceiveResponse(
     WebFrame* frame, unsigned identifier, const WebURLResponse& response) {
 
@@ skipping 1763 matching lines @@
 }
 #endif
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }