Get rid of stashing a frame pointer with ResourceRequest and just store the routing id directly. This simplifies the renderer code and also allow this code to be used in worker processes, where we don't have a frame.

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

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

1 files changed, 8 insertions, 4 deletions

diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 5027d5a..2bb5916 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -1241,9 +1241,8 @@ bool WebPluginImpl::InitiateHTTPRequest(int resource_id,
   ClientInfo info;
   info.id = resource_id;
   info.client = client;
-  info.request.setFrame(frame());
   info.request.setURL(kurl);
-  info.request.setOriginPid(delegate_->GetProcessId());
+  info.request.setRequestorProcessID(delegate_->GetProcessId());
   info.request.setTargetType(WebCore::ResourceRequest::TargetIsObject);
   info.request.setHTTPMethod(method);
 
@@ -1268,8 +1267,13 @@ bool WebPluginImpl::InitiateHTTPRequest(int resource_id,
     SetPostData(&info.request, buf, buf_len);
   }
 
-  info.handle = WebCore::ResourceHandle::create(info.request, this, frame(),
-                                                false, false);
+  // Sets the routing id to associate the ResourceRequest with the RenderView.
+  WebCore::ResourceResponse response;
+  frame()->loader()->client()->dispatchWillSendRequest(
+      NULL, 0, info.request, response);
+
+  info.handle = WebCore::ResourceHandle::create(
+      info.request, this, NULL, false, false);
   if (!info.handle) {
     return false;
   }