Update routing id of pending resource requests for reparented iframes.

content/common/resource_dispatcher.cc

Index: content/common/resource_dispatcher.cc
diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc
index c16d92f9da976cacab335e8f252e2dccace01e41..2ee2db76fc36f17cbf8bba3bc83ce83145d54bb2 100644
--- a/content/common/resource_dispatcher.cc
+++ b/content/common/resource_dispatcher.cc
@@ -53,6 +53,7 @@ class IPCResourceLoaderBridge : public ResourceLoaderBridge {
   virtual void Cancel();
   virtual void SetDefersLoading(bool value);
   virtual void SyncLoad(SyncLoadResponse* response);
+  virtual void UpdateRoutingId(int new_routing_id);
 
  private:
   ResourceLoaderBridge::Peer* peer_;
@@ -224,6 +225,18 @@ void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
   response->download_file_path = result.download_file_path;
 }
 
+void IPCResourceLoaderBridge::UpdateRoutingId(int new_routing_id) {
+  if (request_id_ < 0) {
+    NOTREACHED() << "Trying to update an unstarted request";
+    return;
+  }
+
+  routing_id_ = new_routing_id;
+  dispatcher_->message_sender()->Send(
+      new ResourceHostMsg_TransferRequestToNewPage(new_routing_id,

[jam, 2011/08/15 16:31:02]

these two values are the same, so just send one only in a control message

[Dmitry Titov, 2011/08/15 20:50:10]

I switched to control message and pass 2 values - the new routing_id and a
request_id.

[jam, 2011/08/15 22:07:07]

what I meant is that these two values are always the same, since request_id_ is
set to new_routing_id before sending the message

+                                                   request_id_));
+}
+
 }  // namespace webkit_glue
 
 // ResourceDispatcher ---------------------------------------------------------