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

chrome/renderer/render_view.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.
 
 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 175 matching lines @@
                                      bool is_new_navigation);
   virtual void DidReceiveTitle(WebView* webview,
                                const std::wstring& title,
                                WebFrame* frame);
   virtual void DidFinishLoadForFrame(WebView* webview,
                                      WebFrame* frame);
   virtual void DidFailLoadWithError(WebView* webview,
                                     const WebError& error,
                                     WebFrame* forFrame);
   virtual void DidFinishDocumentLoadForFrame(WebView* webview, WebFrame* frame);
-  virtual bool DidLoadResourceFromMemoryCache(WebView* webview,
-                                              const WebRequest& request,
-                                              const WebResponse& response,
-                                              WebFrame* frame);
+  virtual bool DidLoadResourceFromMemoryCache(
+      WebView* webview,
+      const WebRequest& request,
+      const WebResponse& response,
+      WebFrame* frame,
+      const std::string& frame_origin,
+      const std::string& main_frame_origin);
   virtual void DidHandleOnloadEventsForFrame(WebView* webview, WebFrame* frame);
   virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
                                                    WebFrame* frame,
                                                    bool is_new_navigation);
   virtual void DidReceiveIconForFrame(WebView* webview, WebFrame* frame);
 
   virtual void WillPerformClientRedirect(WebView* webview,
                                          WebFrame* frame,
                                          const GURL& src_url,
                                          const GURL& dest_url,
@@ skipping 589 matching lines @@
   // change but is overridden by tests.
   int delay_seconds_for_form_state_sync_;
 
   // A set of audio renderers registered to use IPC for audio output.
   IDMap<AudioRendererImpl> audio_renderers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_