Fix our handling of mixed SSL / non-SSL content....

webkit/glue/resource_loader_bridge.h

 // 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.
 //
 // The intent of this file is to provide a type-neutral abstraction between
 // Chrome and WebKit for resource loading. This pure-virtual interface is
 // implemented by the embedder, which also provides a factory method Create
 // to instantiate this object.
 //
 // One of these objects will be created by WebKit for each request. WebKit
@@ skipping 134 matching lines @@
   // be null if no extra request headers need to be set.
   //
   // The WebFrame passed to this function provides context about the origin
   // of the resource request.
   //
   // policy_url is the URL of the document in the top-level window, which may be
   // checked by the third-party cookie blocking policy.
   //
   // load_flags is composed of the values defined in url_request_load_flags.h
   //
-  // mixed_content when true indicates that the resource associated with this
-  // request is over HTTP when the main page was loaded over HTTPS.
-  //
   // request_type indicates if the current request is the main frame load, a
   // sub-frame load, or a sub objects load.
   static ResourceLoaderBridge* Create(WebFrame* frame,
                                       const std::string& method,
                                       const GURL& url,
                                       const GURL& policy_url,
                                       const GURL& referrer,
+                                      const std::string& frame_origin,
+                                      const std::string& main_frame_origin,
                                       const std::string& headers,
                                       int load_flags,
                                       int origin_pid,
-                                      ResourceType::Type request_type,
-                                      bool mixed_content);
+                                      ResourceType::Type request_type);
 
   // Call this method before calling Start() to append a chunk of binary data
   // to the request body.  May only be used with HTTP(S) POST requests.
   virtual void AppendDataToUpload(const char* data, int data_len) = 0;
 
   // Call this method before calling Start() to append the contents of a file
   // to the request body.  May only be used with HTTP(S) POST requests.
   void AppendFileToUpload(const std::wstring& file_path) {
     AppendFileRangeToUpload(file_path, 0, kuint64max);
   }
@@ skipping 30 matching lines @@
   // construction must go through Create()
   ResourceLoaderBridge();
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(ResourceLoaderBridge);
 };
 
 }  // namespace webkit_glue
 
 #endif  // RESOURCE_LOADER_BRIDGE_