Get rid of stashing a frame pointer with ResourceRequest and just store the r...

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2008 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.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 1223 matching lines @@
   if (!client) {
     NOTREACHED();
     return false;
   }
 
   WebCore::KURL kurl = webkit_glue::GURLToKURL(url);
 
   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);
 
   if (range_info)
     info.request.addHTTPHeaderField("Range", range_info);
 
   WebCore::String referrer;
   // GetURL/PostURL requests initiated explicitly by plugins should specify the
   // plugin SRC url as the referrer if it is available.
   if (use_plugin_src_as_referrer && !plugin_url_.spec().empty()) {
     referrer = webkit_glue::StdStringToString(plugin_url_.spec());
   } else {
     referrer = frame()->loader()->outgoingReferrer();
   }
 
   if (!WebCore::FrameLoader::shouldHideReferrer(kurl, referrer))
     info.request.setHTTPReferrer(referrer);
 
   if (strcmp(method, "POST") == 0) {
     // Adds headers or form data to a request.  This must be called before
     // we initiate the actual request.
     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;
   }
 
   clients_.push_back(info);
   return true;
 }
 
 void WebPluginImpl::CancelDocumentLoad() {
   if (frame()->loader()->activeDocumentLoader()) {
@@ skipping 143 matching lines @@
     client_index = clients_.erase(client_index);
     if (resource_client)
       resource_client->DidFail();
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_->set_plugin_delegate(NULL);
   webframe_ = NULL;
 }