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

content/common/resource_dispatcher.h

 // 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #ifndef CONTENT_COMMON_RESOURCE_DISPATCHER_H_
 #define CONTENT_COMMON_RESOURCE_DISPATCHER_H_
 #pragma once
 
@@ skipping 22 matching lines @@
   virtual bool OnMessageReceived(const IPC::Message& message);
 
   // Creates a ResourceLoaderBridge for this type of dispatcher, this is so
   // this can be tested regardless of the ResourceLoaderBridge::Create
   // implementation.
   webkit_glue::ResourceLoaderBridge* CreateBridge(
       const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info);
 
   // Adds a request from the pending_requests_ list, returning the new
   // requests' ID
-  int AddPendingRequest(webkit_glue::ResourceLoaderBridge::Peer* callback,
+  int AddPendingRequest(int webkit_request_id,
+                        webkit_glue::ResourceLoaderBridge::Peer* callback,
                         ResourceType::Type resource_type,
                         const GURL& request_url);
 
   // Removes a request from the pending_requests_ list, returning true if the
   // request was found and removed.
   bool RemovePendingRequest(int request_id);
 
   // Cancels a request in the pending_requests_ list.
   void CancelPendingRequest(int routing_id, int request_id);
 
+  // Updates the request that was transferred to a new page.
+  void TransferRequestToNewPage(int webkit_identifier, int new_routing_id);
+
   IPC::Message::Sender* message_sender() const {
     return message_sender_;
   }
 
   // Toggles the is_deferred attribute for the specified request.
   void SetDefersLoading(int request_id, bool value);
 
   // This does not take ownership of the delegate. It is expected that the
   // delegate have a longer lifetime than the ResourceDispatcher.
   void set_delegate(ResourceDispatcherDelegate* delegate) {
     delegate_ = delegate;
   }
 
  private:
   friend class ResourceDispatcherTest;
 
   typedef std::deque<IPC::Message*> MessageQueue;
   struct PendingRequestInfo {
     PendingRequestInfo() { }
-    PendingRequestInfo(webkit_glue::ResourceLoaderBridge::Peer* peer,
+    PendingRequestInfo(int webkit_request_id,
+                       webkit_glue::ResourceLoaderBridge::Peer* peer,
                        ResourceType::Type resource_type,
                        const GURL& request_url)
-        : peer(peer),
+        : webkit_request_id(webkit_request_id),
+          peer(peer),
           resource_type(resource_type),
           is_deferred(false),
           url(request_url) {
     }
     ~PendingRequestInfo() { }
+    int webkit_request_id;
     webkit_glue::ResourceLoaderBridge::Peer* peer;
     ResourceType::Type resource_type;
     MessageQueue deferred_message_queue;
     bool is_deferred;
     GURL url;
     linked_ptr<IPC::Message> pending_redirect_message;
   };
   typedef base::hash_map<int, PendingRequestInfo> PendingRequestList;
 
   // Helper to lookup the info based on the request_id.
@@ skipping 59 matching lines @@
   PendingRequestList pending_requests_;
 
   ScopedRunnableMethodFactory<ResourceDispatcher> method_factory_;
 
   ResourceDispatcherDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
 #endif  // CONTENT_COMMON_RESOURCE_DISPATCHER_H_