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

webkit/glue/webview_delegate.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.
 
 // WebCore provides hooks for several kinds of functionality, allowing separate
 // classes termed "delegates" to receive notifications (in the form of direct
 // function calls) when certain events are about to occur or have just occurred.
 // In some cases, the delegate implements the needed functionality; in others,
 // the delegate has some control over the behavior but doesn't actually
 // implement it.  For example, the UI delegate is responsible for showing a
@@ skipping 327 matching lines @@
   // Notifies the delegate of a DOMContentLoaded event.
   // This is called when the html resource has been loaded, but
   // not necessarily all subresources (images, stylesheets). So, this is called
   // before DidFinishLoadForFrame.
   virtual void DidFinishDocumentLoadForFrame(WebView* webview, WebFrame* frame) {
   }
 
   // This method is called when we load a resource from an in-memory cache.
   // A return value of |false| indicates the load should proceed, but WebCore
   // appears to largely ignore the return value.
-  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,

[jcampan, 2009/03/16 18:43:54]

Would it make sense to make the frame origins gettable from the WebResponse
(like we do with the security info)? That way these params would not have to be
passed around in method calls  that take a WebResponse.

[abarth-chromium, 2009/03/16 21:34:21]

I'm not sure that makes sense.  It's not really a property of the response. 
It's a property of the context that's receiving the response.  Maybe we should
add it to WebFrame?

+      const std::string& main_frame_origin) {
     return false;
   }
 
   // This is called after javascript onload handlers have been fired.
   virtual void DidHandleOnloadEventsForFrame(WebView* webview, WebFrame* frame) {
   }
 
   // This method is called when anchors within a page have been clicked.
   // It is very similar to DidCommitLoadForFrame.
   virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
@@ skipping 411 matching lines @@
   virtual void DidAddHistoryItem() { }
 
   WebViewDelegate() { }
   virtual ~WebViewDelegate() { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebViewDelegate);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_DELEGATE_H_