Avoid sending mixed-content requests for ImageSet contexts

third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 218 matching lines @@
 
     TextPosition position =
         TextPosition(source.CurrentLine(), source.CurrentColumn());
     FetchParameters::ResourceWidth resource_width;
     float source_size = source_size_;
     bool source_size_set = source_size_set_;
     if (picture_data.picked) {
       source_size_set = picture_data.source_size_set;
       source_size = picture_data.source_size;
     }
+    ResourceFetcher::IsImageSet is_image_set =
+        (picture_data.picked || !srcset_image_candidate_.IsEmpty())
+            ? ResourceFetcher::kImageIsImageSet
+            : ResourceFetcher::kImageNotImageSet;
+
     if (source_size_set) {
       resource_width.width = source_size;
       resource_width.is_set = true;
     }
 
     if (type == WTF::kNullopt)
       type = ResourceType();
 
     // The element's 'referrerpolicy' attribute (if present) takes precedence
     // over the document's referrer policy.
     ReferrerPolicy referrer_policy =
         (referrer_policy_ != kReferrerPolicyDefault) ? referrer_policy_
                                                      : document_referrer_policy;
     auto request = PreloadRequest::CreateIfNeeded(
         InitiatorFor(tag_impl_), position, url_to_load_, predicted_base_url,
         type.value(), referrer_policy, PreloadRequest::kDocumentIsReferrer,
-        resource_width, client_hints_preferences, request_type);
+        is_image_set, resource_width, client_hints_preferences, request_type);
     if (!request)
       return nullptr;
 
     request->SetCrossOrigin(cross_origin_);
     request->SetNonce(nonce_);
     request->SetCharset(Charset());
     request->SetDefer(defer_);
     request->SetIntegrityMetadata(integrity_metadata_);
     if (scanner_type_ == ScannerType::kInsertion)
       request->SetFromInsertionScanner(true);
@@ skipping 532 matching lines @@
       if (Match(tag_impl, styleTag)) {
         if (in_style_)
           css_scanner_.Reset();
         in_style_ = false;
         return;
       }
       if (Match(tag_impl, scriptTag)) {
         in_script_ = false;
         return;
       }
-      if (Match(tag_impl, pictureTag))
+      if (Match(tag_impl, pictureTag)) {
         in_picture_ = false;
+        picture_data_.picked = false;
+      }
       return;
     }
     case HTMLToken::kStartTag: {
       if (template_count_)
         return;
       const StringImpl* tag_impl = TagImplFor(token.Data());
       if (Match(tag_impl, templateTag)) {
         ++template_count_;
         return;
       }
@@ skipping 135 matching lines @@
   default_viewport_min_width = document->ViewportDefaultMinWidth();
   viewport_meta_zero_values_quirk =
       document->GetSettings() &&
       document->GetSettings()->GetViewportMetaZeroValuesQuirk();
   viewport_meta_enabled = document->GetSettings() &&
                           document->GetSettings()->GetViewportMetaEnabled();
   referrer_policy = document->GetReferrerPolicy();
 }
 
 }  // namespace blink