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

webkit/glue/webframeloaderclient_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 <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 375 matching lines @@
 }
 
 bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(
     DocumentLoader* loader,
     const ResourceRequest& request,
     const ResourceResponse& response,
     int length) {
   WebViewImpl* webview = webframe_->webview_impl();
   WebViewDelegate* d = webview->delegate();
   if (d) {
+    Frame* frame = webframe_->frame();
+    std::string frame_origin = webkit_glue::FrameToOrigin(frame);
+    std::string main_frame_origin =
+        webkit_glue::FrameToOrigin(frame ? frame->tree()->top() : NULL);
+
     WebRequestImpl webreq(request);
     WebResponseImpl webresp(response);
     return d->DidLoadResourceFromMemoryCache(webview, webreq, webresp,
-                                             webframe_);
+                                             webframe_, frame_origin,
+                                             main_frame_origin);
   }
 
   return false;
 }
 
 void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() {
   // During the onload event of a subframe, the subframe can be removed.  In
   // that case, it has no page.  This is covered by
   // LayoutTests/fast/dom/replaceChild.html
   if (!webframe_->frame()->page())
@@ skipping 1103 matching lines @@
   if (!middle_or_ctrl && !shift && !alt)
     return false;
 
   DCHECK(disposition);
   if (middle_or_ctrl)
     *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   else
     *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK;
   return true;
 }