Update routing id of pending resource requests for reparented iframes.

content/common/resource_dispatcher.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 35 matching lines @@
       const FilePath& path,
       uint64 offset,
       uint64 length,
       const base::Time& expected_modification_time);
   virtual void AppendBlobToUpload(const GURL& blob_url);
   virtual void SetUploadIdentifier(int64 identifier);
   virtual bool Start(Peer* peer);
   virtual void Cancel();
   virtual void SetDefersLoading(bool value);
   virtual void SyncLoad(SyncLoadResponse* response);
+  virtual void UpdateRoutingId(int new_routing_id);
 
  private:
   ResourceLoaderBridge::Peer* peer_;
 
   // The resource dispatcher for this loader.  The bridge doesn't own it, but
   // it's guaranteed to outlive the bridge.
   ResourceDispatcher* dispatcher_;
 
   // The request to send, created on initialization for modification and
   // appending data.
@@ skipping 151 matching lines @@
   response->response_time = result.response_time;
   response->encoded_data_length = result.encoded_data_length;
   response->connection_id = result.connection_id;
   response->connection_reused = result.connection_reused;
   response->load_timing = result.load_timing;
   response->devtools_info = result.devtools_info;
   response->data.swap(result.data);
   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 ---------------------------------------------------------
 
 ResourceDispatcher::ResourceDispatcher(IPC::Message::Sender* sender)
     : message_sender_(sender),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       delegate_(NULL) {
 }
 
@@ skipping 347 matching lines @@
 
 // static
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }