Reland 97048 - Update routing id of pending resource requests for reparented iframes.

BUG=55200
TEST=MagicIframeBrowserTest.TransferIframeCloseWindow

Review URL: http://codereview.chromium.org/7647003

TBR=rvargas@google.com
Review URL: http://codereview.chromium.org/7669009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97078 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 0 deletions

diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 102761c..97ada31 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -263,6 +263,7 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
   void Start(
       const WebURLRequest& request,
       ResourceLoaderBridge::SyncLoadResponse* sync_load_response);
+  void UpdateRoutingId(int new_routing_id);
 
   // ResourceLoaderBridge::Peer methods:
   virtual void OnUploadProgress(uint64 position, uint64 size);
@@ -324,6 +325,11 @@ void WebURLLoaderImpl::Context::SetDefersLoading(bool value) {
     bridge_->SetDefersLoading(value);
 }
 
+void WebURLLoaderImpl::Context::UpdateRoutingId(int new_routing_id) {
+  if (bridge_.get())
+    bridge_->UpdateRoutingId(new_routing_id);
+}
+
 void WebURLLoaderImpl::Context::Start(
     const WebURLRequest& request,
     ResourceLoaderBridge::SyncLoadResponse* sync_load_response) {
@@ -729,4 +735,8 @@ void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
+void WebURLLoaderImpl::UpdateRoutingId(int new_routing_id) {
+  context_->UpdateRoutingId(new_routing_id);
+}
+
 }  // namespace webkit_glue