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

chrome/common/render_messages.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_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 
 #include <string>
 #include <vector>
 #include <map>
@@ skipping 224 matching lines @@
   // The URL of the document in the top-level window, which may be checked by
   // the third-party cookie blocking policy. Leaving it empty may lead to
   // undesired cookie blocking. Third-party cookie blocking can be bypassed by
   // setting policy_url = url, but this should ideally only be done if there
   // really is no way to determine the correct value.
   GURL policy_url;
 
   // The referrer to use (may be empty).
   GURL referrer;
 
+  // The origin of the frame that is associated with this request.  This is used
+  // to update our mixed content state.
+  std::string frame_origin;
+
+  // The origin of the main frame (top-level frame) that is associated with this
+  // request.  This is used to update our mixed content state.
+  std::string main_frame_origin;
+
   // Additional HTTP request headers.
   std::string headers;
 
   // URLRequest load flags (0 by default).
   int load_flags;
 
   // Process ID of process that originated this request.
   int origin_pid;
 
   // What this resource load is for (main frame, sub-frame, sub-resource,
   // object).
   ResourceType::Type resource_type;
 
-  // True if this request is for a resource loaded over HTTP when the main page
-  // was loaded over HTTPS.
-  bool mixed_content;
-
   // Used by plugin->browser requests to get the correct URLRequestContext.
   uint32 request_context;
 
   // Optional upload data (may be empty).
   std::vector<net::UploadData::Element> upload_content;
 };
 
 // Parameters for a render request.
 struct ViewMsg_Print_Params {
   // In pixels according to dpi_x and dpi_y.
@@ skipping 965 matching lines @@
 
 // Traits for ViewHostMsg_Resource_Request
 template <>
 struct ParamTraits<ViewHostMsg_Resource_Request> {
   typedef ViewHostMsg_Resource_Request param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.method);
     WriteParam(m, p.url);
     WriteParam(m, p.policy_url);
     WriteParam(m, p.referrer);
+    WriteParam(m, p.frame_origin);
+    WriteParam(m, p.main_frame_origin);
     WriteParam(m, p.headers);
     WriteParam(m, p.load_flags);
     WriteParam(m, p.origin_pid);
     WriteParam(m, p.resource_type);
-    WriteParam(m, p.mixed_content);
     WriteParam(m, p.request_context);
     WriteParam(m, p.upload_content);
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
     return
       ReadParam(m, iter, &r->method) &&
       ReadParam(m, iter, &r->url) &&
       ReadParam(m, iter, &r->policy_url) &&
       ReadParam(m, iter, &r->referrer) &&
+      ReadParam(m, iter, &r->frame_origin) &&
+      ReadParam(m, iter, &r->main_frame_origin) &&
       ReadParam(m, iter, &r->headers) &&
       ReadParam(m, iter, &r->load_flags) &&
       ReadParam(m, iter, &r->origin_pid) &&
       ReadParam(m, iter, &r->resource_type) &&
-      ReadParam(m, iter, &r->mixed_content) &&
       ReadParam(m, iter, &r->request_context) &&
       ReadParam(m, iter, &r->upload_content);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
     LogParam(p.method, l);
     l->append(L", ");
     LogParam(p.url, l);
     l->append(L", ");
     LogParam(p.referrer, l);
     l->append(L", ");
+    LogParam(p.frame_origin, l);
+    l->append(L", ");
+    LogParam(p.main_frame_origin, l);
+    l->append(L", ");
     LogParam(p.load_flags, l);
     l->append(L", ");
     LogParam(p.origin_pid, l);
     l->append(L", ");
     LogParam(p.resource_type, l);
     l->append(L", ");
-    LogParam(p.mixed_content, l);
-    l->append(L", ");
     LogParam(p.request_context, l);
     l->append(L")");
   }
 };
 
 // Traits for URLRequestStatus
 template <>
 struct ParamTraits<URLRequestStatus> {
   typedef URLRequestStatus param_type;
   static void Write(Message* m, const param_type& p) {
@@ skipping 531 matching lines @@
 };
 
 
 }  // namespace IPC
 
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "chrome/common/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_