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

chrome/renderer/renderer_glue.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.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 217 matching lines @@
   return results;
 }
 
 // static factory function
 ResourceLoaderBridge* ResourceLoaderBridge::Create(
     WebFrame* webframe,
     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 resource_type,
-    bool mixed_content) {
+    ResourceType::Type resource_type) {
   // TODO(darin): we need to eliminate the webframe parameter because webkit
   // does not always supply it (see ResourceHandle::loadResourceSynchronously).
   // Instead we should add context to ResourceRequest, which will be easy to do
   // once we merge to the latest WebKit (r23806 at least).
   if (!webframe) {
     NOTREACHED() << "no webframe";
     return NULL;
   }
 
   if (!webframe->GetView()->GetDelegate())
     return NULL;
 
   RenderView* rv = static_cast<RenderView*>(webframe->GetView()->GetDelegate());
   int route_id = rv->routing_id();
   ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
-  return dispatch->CreateBridge(method, url, policy_url, referrer, headers,
-                                load_flags, origin_pid, resource_type,
-                                mixed_content, 0, route_id);
+  return dispatch->CreateBridge(method, url, policy_url, referrer,
+                                frame_origin, main_frame_origin, headers,
+                                load_flags, origin_pid, resource_type, 0,
+                                route_id);
 }
 
 void NotifyCacheStats() {
   // Update the browser about our cache
   // NOTE: Since this can be called from the plugin process, we might not have
   // a RenderThread.  Do nothing in that case.
   if (!IsPluginProcess())
     RenderThread::current()->InformHostOfCacheStatsLater();
 }
 
 
 }  // namespace webkit_glue