Don't set referrers on outgoing plugin requests if the load_manually flag is ...

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2009 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 "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
@@ skipping 461 matching lines @@
 
 WebPluginImpl::RoutingStatus WebPluginImpl::RouteToFrame(
     const char *method,
     bool is_javascript_url,
     const char* target,
     unsigned int len,
     const char* buf,
     bool is_file_data,
     bool notify_needed,
     intptr_t notify_data,
-    const char* url) {
+    const char* url,
+    Referrer referrer_flag) {
   // If there is no target, there is nothing to do
   if (!target)
     return NOT_ROUTED;
 
   // This could happen if the WebPluginContainer was already deleted.
   if (!webframe_)
     return NOT_ROUTED;
 
   WebString target_str = WebString::fromUTF8(target);
 
@@ skipping 22 matching lines @@
 
   GURL complete_url = CompleteURL(url);
 
   if (strcmp(method, "GET") != 0) {
     // We're only going to route HTTP/HTTPS requests
     if (!(complete_url.SchemeIs("http") || complete_url.SchemeIs("https")))
       return INVALID_URL;
   }
 
   WebURLRequest request(complete_url);
+  SetReferrer(&request, referrer_flag);
+
   request.setHTTPMethod(WebString::fromUTF8(method));
   if (len > 0) {
     if (!is_file_data) {
       if (!SetPostData(&request, buf, len)) {
         // Uhoh - we're in trouble.  There isn't a good way
         // to recover at this point.  Break out.
         NOTREACHED();
         return ROUTED;
       }
     } else {
@@ skipping 53 matching lines @@
 }
 
 void WebPluginImpl::InvalidateRect(const gfx::Rect& rect) {
   if (container_)
     container_->invalidateRect(rect);
 }
 
 void WebPluginImpl::OnDownloadPluginSrcUrl() {
   HandleURLRequestInternal("GET", false, NULL, 0, NULL, false, false,
                            plugin_url_.spec().c_str(), NULL, false,
-                           false);
+                           DOCUMENT_URL);
 }
 
 WebPluginResourceClient* WebPluginImpl::GetClientFromLoader(
     WebURLLoader* loader) {
   ClientInfo* client_info = GetClientInfoFromLoader(loader);
   if (client_info)
     return client_info->client;
   return NULL;
 }
 
@@ skipping 177 matching lines @@
     TearDownPluginInstance(NULL);
   container_ = container;
 }
 
 void WebPluginImpl::HandleURLRequest(const char *method,
                                      bool is_javascript_url,
                                      const char* target, unsigned int len,
                                      const char* buf, bool is_file_data,
                                      bool notify, const char* url,
                                      intptr_t notify_data, bool popups_allowed) {
+  // GetURL/PostURL requests initiated explicitly by plugins should specify the
+  // plugin SRC url as the referrer if it is available.
   HandleURLRequestInternal(method, is_javascript_url, target, len, buf,
                            is_file_data, notify, url, notify_data,
-                           popups_allowed, true);
+                           popups_allowed, PLUGIN_SRC);
 }
 
 void WebPluginImpl::HandleURLRequestInternal(
     const char *method, bool is_javascript_url, const char* target,
     unsigned int len, const char* buf, bool is_file_data, bool notify,
     const char* url, intptr_t notify_data, bool popups_allowed,
-    bool use_plugin_src_as_referrer) {
+    Referrer referrer_flag) {
   // For this request, we either route the output to a frame
   // because a target has been specified, or we handle the request
   // here, i.e. by executing the script if it is a javascript url
   // or by initiating a download on the URL, etc. There is one special
   // case in that the request is a javascript url and the target is "_self",
   // in which case we route the output to the plugin rather than routing it
   // to the plugin's frame.
   RoutingStatus routing_status =
       RouteToFrame(method, is_javascript_url, target, len, buf, is_file_data,
-                   notify, notify_data, url);
+                   notify, notify_data, url, referrer_flag);
   if (routing_status == ROUTED)
     return;
 
   if (is_javascript_url) {
     GURL gurl(url);
     WebString result = container_->executeScriptURL(gurl, popups_allowed);
 
     // delegate_ could be NULL because executeScript caused the container to
     // be deleted.
     if (delegate_) {
@@ skipping 17 matching lines @@
       return;
     }
 
     // CreateResourceClient() sends a synchronous IPC message so it's possible
     // that TearDownPluginInstance() may have been called in the nested
     // message loop.  If so, don't start the request.
     if (!delegate_)
       return;
 
     InitiateHTTPRequest(resource_id, resource_client, method, buf, len,
-                        complete_url, NULL, use_plugin_src_as_referrer);
+                        complete_url, NULL, referrer_flag);
   }
 }
 
 int WebPluginImpl::GetNextResourceId() {
   static int next_id = 0;
   return ++next_id;
 }
 
 bool WebPluginImpl::InitiateHTTPRequest(int resource_id,
                                         WebPluginResourceClient* client,
                                         const char* method, const char* buf,
                                         int buf_len,
                                         const GURL& url,
                                         const char* range_info,
-                                        bool use_plugin_src_as_referrer) {
+                                        Referrer referrer_flag) {
   if (!client) {
     NOTREACHED();
     return false;
   }
 
   ClientInfo info;
   info.id = resource_id;
   info.client = client;
   info.request.initialize();
   info.request.setURL(url);
   info.request.setRequestorProcessID(delegate_->GetProcessId());
   info.request.setTargetType(WebURLRequest::TargetIsObject);
   info.request.setHTTPMethod(WebString::fromUTF8(method));
   info.pending_failure_notification = false;
 
   if (range_info) {
     info.request.addHTTPHeaderField(WebString::fromUTF8("Range"),
                                     WebString::fromUTF8(range_info));
   }
 
   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);
   }
 
-  // GetURL/PostURL requests initiated explicitly by plugins should specify the
-  // plugin SRC url as the referrer if it is available.
-  GURL referrer_url;
-  if (use_plugin_src_as_referrer && !plugin_url_.spec().empty())
-    referrer_url = plugin_url_;
-  webframe_->setReferrerForRequest(info.request, referrer_url);
+  SetReferrer(&info.request, referrer_flag);
 
   // Sets the routing id to associate the ResourceRequest with the RenderView.
   webframe_->dispatchWillSendRequest(info.request);
 
   info.loader.reset(WebKit::webKitClient()->createURLLoader());
   if (!info.loader.get())
     return false;
   info.loader->loadAsynchronously(info.request, this);
 
   clients_.push_back(info);
@@ skipping 12 matching lines @@
                                              intptr_t existing_stream,
                                              bool notify_needed,
                                              intptr_t notify_data) {
   int resource_id = GetNextResourceId();
   GURL complete_url = CompleteURL(url);
 
   WebPluginResourceClient* resource_client = delegate_->CreateResourceClient(
       resource_id, complete_url, notify_needed, notify_data, existing_stream);
   InitiateHTTPRequest(
       resource_id, resource_client, "GET", NULL, 0, complete_url, range_info,
-      true);
+      load_manually_ ? NO_REFERRER : PLUGIN_SRC);
 }
 
 void WebPluginImpl::SetDeferResourceLoading(int resource_id, bool defer) {
   std::vector<ClientInfo>::iterator client_index = clients_.begin();
   while (client_index != clients_.end()) {
     ClientInfo& client_info = *client_index;
 
     if (client_info.id == resource_id) {
       client_info.loader->setDefersLoading(defer);
 
@@ skipping 114 matching lines @@
 
     client_index = clients_.erase(client_index);
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_ = NULL;
   method_factory_.RevokeAll();
 }
 
+void WebPluginImpl::SetReferrer(WebKit::WebURLRequest* request,
+                                Referrer referrer_flag) {
+  switch (referrer_flag) {
+    case DOCUMENT_URL:
+      webframe_->setReferrerForRequest(*request, GURL());
+      break;
+
+    case PLUGIN_SRC:
+      webframe_->setReferrerForRequest(*request, plugin_url_);
+      break;
+
+    default:
+      break;
+  }
+}
+
 }  // namespace webkit_glue