SSLPolicy Fix: Step 3.

Plumbing the security origin of the frame making the request to SSL land.

R=wtc
BUG=8706

Review URL: http://codereview.chromium.org/48038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11851 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 20 deletions

diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index 2061a3b..161c237 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -17,10 +17,10 @@
 #ifndef RESOURCE_LOADER_BRIDGE_H_
 #define RESOURCE_LOADER_BRIDGE_H_
 
-#include "build/build_config.h"

-#if defined(OS_POSIX)

-#include "base/file_descriptor_posix.h"

-#endif

+#include "build/build_config.h"
+#if defined(OS_POSIX)
+#include "base/file_descriptor_posix.h"
+#endif
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
@@ -67,18 +67,18 @@ class ResourceLoaderBridge {
     // Content length if available. -1 if not available
     int64 content_length;
 
-    // A platform specific handle for a file that carries response data. This

-    // entry is used if the resource request is of type ResourceType::MEDIA and

-    // the underlying cache layer keeps the response data in a standalone file.

-#if defined(OS_POSIX)

-    // If the response data file is available, the file handle is stored in

-    // response_data_file.fd, its value is base::kInvalidPlatformFileValue

-    // otherwise.

-    base::FileDescriptor response_data_file;

-#elif defined(OS_WIN)

-    // An asynchronous file handle to the response data file, its value is

-    // base::kInvalidPlatformFileValue if the file is not available.

-    base::PlatformFile response_data_file;

+    // A platform specific handle for a file that carries response data. This
+    // entry is used if the resource request is of type ResourceType::MEDIA and
+    // the underlying cache layer keeps the response data in a standalone file.
+#if defined(OS_POSIX)
+    // If the response data file is available, the file handle is stored in
+    // response_data_file.fd, its value is base::kInvalidPlatformFileValue
+    // otherwise.
+    base::FileDescriptor response_data_file;
+#elif defined(OS_WIN)
+    // An asynchronous file handle to the response data file, its value is
+    // base::kInvalidPlatformFileValue if the file is not available.
+    base::PlatformFile response_data_file;
 #endif
   };
 
@@ -168,9 +168,6 @@ class ResourceLoaderBridge {
   //
   // load_flags is composed of the values defined in url_request_load_flags.h
   //
-  // mixed_content when true indicates that the resource associated with this
-  // request is over HTTP when the main page was loaded over HTTPS.
-  //
   // request_type indicates if the current request is the main frame load, a
   // sub-frame load, or a sub objects load.
   //
@@ -180,11 +177,12 @@ class ResourceLoaderBridge {
                                       const GURL& url,
                                       const GURL& policy_url,
                                       const GURL& referrer,
+                                      const std::string& frame_origin,
+                                      const std::string& main_frame_origin,
                                       const std::string& headers,
                                       int load_flags,
                                       int requestor_pid,
                                       ResourceType::Type request_type,
-                                      bool mixed_content,
                                       int routing_id);
 
   // Call this method before calling Start() to append a chunk of binary data