Avoid sending mixed-content requests for ImageSet contexts

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 201 matching lines @@
 static void PopulateTimingInfo(ResourceTimingInfo* info, Resource* resource) {
   KURL initial_url = resource->GetResponse().RedirectResponses().IsEmpty()
                          ? resource->GetResourceRequest().Url()
                          : resource->GetResponse().RedirectResponses()[0].Url();
   info->SetInitialURL(initial_url);
   info->SetFinalResponse(resource->GetResponse());
 }
 
 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)
         return WebURLRequest::kRequestContextIframe;
       // FIXME: Change this to a context frame type (once we introduce them):
       // http://fetch.spec.whatwg.org/#concept-request-context-frame-type
       return WebURLRequest::kRequestContextHyperlink;
     case Resource::kXSLStyleSheet:
       DCHECK(RuntimeEnabledFeatures::xsltEnabled());
     case Resource::kCSSStyleSheet:
       return WebURLRequest::kRequestContextStyle;
     case Resource::kScript:
       return WebURLRequest::kRequestContextScript;
     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;
     case Resource::kImportResource:
       return WebURLRequest::kRequestContextImport;
     case Resource::kLinkPrefetch:
       return WebURLRequest::kRequestContextPrefetch;
     case Resource::kTextTrack:
       return WebURLRequest::kRequestContextTrack;
     case Resource::kSVGDocument:
@@ skipping 419 matching lines @@
 
 void ResourceFetcher::ResourceTimingReportTimerFired(TimerBase* timer) {
   DCHECK_EQ(timer, &resource_timing_report_timer_);
   Vector<RefPtr<ResourceTimingInfo>> timing_reports;
   timing_reports.swap(scheduled_resource_timing_reports_);
   for (const auto& timing_info : timing_reports)
     Context().AddResourceTiming(*timing_info);
 }
 
 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(
     ResourceRequest& request,
     Resource::Type type,
     FetchParameters::DeferOption defer) {
   if (request.GetCachePolicy() == WebCachePolicy::kUseProtocolCachePolicy) {
     request.SetCachePolicy(
         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");
 
   Context().AddAdditionalRequestHeaders(
       request, (type == Resource::kMainResource) ? kFetchMainResource
                                                  : kFetchSubresource);
 }
 
 void ResourceFetcher::InitializeRevalidation(
     ResourceRequest& revalidating_request,
@@ skipping 825 matching lines @@
   visitor->Trace(context_);
   visitor->Trace(archive_);
   visitor->Trace(loaders_);
   visitor->Trace(non_blocking_loaders_);
   visitor->Trace(document_resources_);
   visitor->Trace(preloads_);
   visitor->Trace(resource_timing_info_map_);
 }
 
 }  // namespace blink