Revert of Don't lower priority for scripts inserted by doc.write

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 118 matching lines @@
                                   const String& attribute_value) {
   MediaQuerySet* media_queries = MediaQuerySet::Create(attribute_value);
   MediaQueryEvaluator media_query_evaluator(media_values);
   return media_query_evaluator.Eval(media_queries);
 }
 
 class TokenPreloadScanner::StartTagScanner {
   STACK_ALLOCATED();
 
  public:
-  StartTagScanner(const StringImpl* tag_impl,
-                  MediaValuesCached* media_values,
-                  TokenPreloadScanner::ScannerType scanner_type)
+  StartTagScanner(const StringImpl* tag_impl, MediaValuesCached* media_values)
       : tag_impl_(tag_impl),
         link_is_style_sheet_(false),
         link_is_preconnect_(false),
         link_is_preload_(false),
         link_is_import_(false),
         matched_(true),
         input_is_image_(false),
         nomodule_attribute_value_(false),
         source_size_(0),
         source_size_set_(false),
         defer_(FetchParameters::kNoDefer),
         cross_origin_(kCrossOriginAttributeNotSet),
         media_values_(media_values),
         referrer_policy_set_(false),
-        referrer_policy_(kReferrerPolicyDefault),
-        scanner_type_(scanner_type) {
+        referrer_policy_(kReferrerPolicyDefault) {
     if (Match(tag_impl_, imgTag) || Match(tag_impl_, sourceTag)) {
       source_size_ = SizesAttributeParser(media_values_, String()).length();
       return;
     }
     if (!Match(tag_impl_, inputTag) && !Match(tag_impl_, linkTag) &&
         !Match(tag_impl_, scriptTag) && !Match(tag_impl_, videoTag))
       tag_impl_ = 0;
   }
 
   enum URLReplacement { kAllowURLReplacement, kDisallowURLReplacement };
@@ skipping 86 matching lines @@
         type.value(), referrer_policy, PreloadRequest::kDocumentIsReferrer,
         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);
 
     return request;
   }
 
  private:
   template <typename NameType>
   void ProcessScriptAttribute(const NameType& attribute_name,
                               const String& attribute_value) {
     // FIXME - Don't set crossorigin multiple times.
     if (Match(attribute_name, srcAttr))
@@ skipping 296 matching lines @@
   bool nomodule_attribute_value_;
   float source_size_;
   bool source_size_set_;
   FetchParameters::DeferOption defer_;
   CrossOriginAttributeValue cross_origin_;
   String nonce_;
   Member<MediaValuesCached> media_values_;
   bool referrer_policy_set_;
   ReferrerPolicy referrer_policy_;
   IntegrityMetadataSet integrity_metadata_;
-  TokenPreloadScanner::ScannerType scanner_type_;
 };
 
 TokenPreloadScanner::TokenPreloadScanner(
     const KURL& document_url,
     std::unique_ptr<CachedDocumentParameters> document_parameters,
-    const MediaValuesCached::MediaValuesCachedData& media_values_cached_data,
-    const ScannerType scanner_type)
+    const MediaValuesCached::MediaValuesCachedData& media_values_cached_data)
     : document_url_(document_url),
       in_style_(false),
       in_picture_(false),
       in_script_(false),
       template_count_(0),
       document_parameters_(std::move(document_parameters)),
       media_values_(MediaValuesCached::Create(media_values_cached_data)),
-      scanner_type_(scanner_type),
       did_rewind_(false) {
   DCHECK(document_parameters_.get());
   DCHECK(media_values_.Get());
   DCHECK(document_url.IsValid());
   css_scanner_.SetReferrerPolicy(document_parameters_->referrer_policy);
 }
 
 TokenPreloadScanner::~TokenPreloadScanner() {}
 
 TokenPreloadScannerCheckpoint TokenPreloadScanner::CreateCheckpoint() {
@@ skipping 247 matching lines @@
         HandleMetaNameAttribute(token, document_parameters_.get(),
                                 media_values_.Get(), &css_scanner_, viewport);
       }
 
       if (Match(tag_impl, pictureTag)) {
         in_picture_ = true;
         picture_data_ = PictureData();
         return;
       }
 
-      StartTagScanner scanner(tag_impl, media_values_, scanner_type_);
+      StartTagScanner scanner(tag_impl, media_values_);
       scanner.ProcessAttributes(token.Attributes());
       // TODO(yoav): ViewportWidth is currently racy and might be zero in some
       // cases, at least in tests. That problem will go away once
       // ParseHTMLOnMainThread lands and MediaValuesCached is eliminated.
       if (in_picture_ && media_values_->ViewportWidth())
         scanner.HandlePictureSourceURL(picture_data_);
       std::unique_ptr<PreloadRequest> request = scanner.CreatePreloadRequest(
           predicted_base_element_url_, source, client_hints_preferences_,
           picture_data_, document_parameters_->referrer_policy);
       if (request)
@@ skipping 13 matching lines @@
                                 href_attribute->Value8BitIfNecessary()));
     predicted_base_element_url_ =
         url.IsValid() && !url.ProtocolIsData() ? url.Copy() : KURL();
   }
 }
 
 HTMLPreloadScanner::HTMLPreloadScanner(
     const HTMLParserOptions& options,
     const KURL& document_url,
     std::unique_ptr<CachedDocumentParameters> document_parameters,
-    const MediaValuesCached::MediaValuesCachedData& media_values_cached_data,
-    const TokenPreloadScanner::ScannerType scanner_type)
+    const MediaValuesCached::MediaValuesCachedData& media_values_cached_data)
     : scanner_(document_url,
                std::move(document_parameters),
-               media_values_cached_data,
-               scanner_type),
+               media_values_cached_data),
       tokenizer_(HTMLTokenizer::Create(options)) {}
 
 HTMLPreloadScanner::~HTMLPreloadScanner() {}
 
 void HTMLPreloadScanner::AppendToEnd(const SegmentedString& source) {
   source_.Append(source);
 }
 
 PreloadRequestStream HTMLPreloadScanner::Scan(
     const KURL& starting_base_element_url,
@@ skipping 40 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