Avoid sending mixed-content requests for ImageSet contexts

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index 0554a74ba34eafad9c243add53a20c9f6df3ee9f..0659edae4b82415ec79895de57c05ba6af647a52 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -219,7 +219,10 @@ static void PopulateTimingInfo(ResourceTimingInfo* info, Resource* resource) {
 
 WebURLRequest::RequestContext ResourceFetcher::DetermineRequestContext(
     Resource::Type type,
+    IsImageSet is_image_set,
     bool is_main_frame) {
+  DCHECK((is_image_set == kImageNotImageSet) ||
+         (type == Resource::kImage && is_image_set == kImageIsImageSet));
   switch (type) {
     case Resource::kMainResource:
       if (!is_main_frame)
@@ -236,6 +239,8 @@ WebURLRequest::RequestContext ResourceFetcher::DetermineRequestContext(
     case Resource::kFont:
       return WebURLRequest::kRequestContextFont;
     case Resource::kImage:
+      if (is_image_set == kImageIsImageSet)
+        return WebURLRequest::kRequestContextImageSet;
       return WebURLRequest::kRequestContextImage;
     case Resource::kRaw:
       return WebURLRequest::kRequestContextSubresource;
@@ -675,8 +680,9 @@ void ResourceFetcher::ResourceTimingReportTimerFired(TimerBase* timer) {
 }
 
 WebURLRequest::RequestContext ResourceFetcher::DetermineRequestContext(
-    Resource::Type type) const {
-  return DetermineRequestContext(type, Context().IsMainFrame());
+    Resource::Type type,
+    IsImageSet is_image_set) const {
+  return DetermineRequestContext(type, is_image_set, Context().IsMainFrame());
 }
 
 void ResourceFetcher::InitializeResourceRequest(
@@ -688,7 +694,7 @@ void ResourceFetcher::InitializeResourceRequest(
         Context().ResourceRequestCachePolicy(request, type, defer));
   }
   if (request.GetRequestContext() == WebURLRequest::kRequestContextUnspecified)
-    request.SetRequestContext(DetermineRequestContext(type));
+    request.SetRequestContext(DetermineRequestContext(type, kImageNotImageSet));
   if (type == Resource::kLinkPrefetch)
     request.SetHTTPHeaderField(HTTPNames::Purpose, "prefetch");