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

chrome/renderer/render_view.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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1238 matching lines @@
 
     // Make sure redirect tracking state is clear for the new load.
     completed_client_redirect_src_ = GURL();
   }
 
   Send(new ViewHostMsg_DidStartProvisionalLoadForFrame(
        routing_id_, webview->GetMainFrame() == frame,
        frame->GetProvisionalDataSource()->GetRequest().GetURL()));
 }
 
-bool RenderView::DidLoadResourceFromMemoryCache(WebView* webview,
-                                                const WebRequest& request,
-                                                const WebResponse& response,
-                                                WebFrame* frame) {
+bool RenderView::DidLoadResourceFromMemoryCache(
+    WebView* webview,
+    const WebRequest& request,
+    const WebResponse& response,
+    WebFrame* frame,
+    const std::string& frame_origin,
+    const std::string& main_frame_origin) {
   // Let the browser know we loaded a resource from the memory cache.  This
   // message is needed to display the correct SSL indicators.
   Send(new ViewHostMsg_DidLoadResourceFromMemoryCache(routing_id_,
-      request.GetURL(), response.GetSecurityInfo()));
+      request.GetURL(), frame_origin, main_frame_origin,
+      response.GetSecurityInfo()));
 
   return false;
 }
 
 void RenderView::DidReceiveProvisionalLoadServerRedirect(WebView* webview,
                                                          WebFrame* frame) {
   if (frame == webview->GetMainFrame()) {
     // Received a redirect on the main frame.
     WebDataSource* data_source =
         webview->GetMainFrame()->GetProvisionalDataSource();
@@ skipping 1677 matching lines @@
   DCHECK(audio_renderers_.Lookup(stream_id) != NULL);
   Send(new ViewHostMsg_SetAudioVolume(routing_id_, stream_id, left, right));
 }
 
 void RenderView::OnResize(const gfx::Size& new_size,
                           const gfx::Rect& resizer_rect) {
   if (webview())
     webview()->HideAutofillPopup();
   RenderWidget::OnResize(new_size, resizer_rect);
 }