Stop preloading scripts that have invalid type/language attributes

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 235 matching lines @@
         referrerPolicy, resourceWidth, clientHintsPreferences, requestType);
     if (!request)
       return nullptr;
 
     request->setCrossOrigin(m_crossOrigin);
     request->setNonce(m_nonce);
     request->setCharset(charset());
     request->setDefer(m_defer);
     request->setIntegrityMetadata(m_integrityMetadata);
 
-    // TODO(csharrison): Once this is deprecated, just abort the request here.
-    if (match(m_tagImpl, scriptTag) &&
-        !ScriptLoader::isValidScriptTypeAndLanguage(
-            m_typeAttributeValue, m_languageAttributeValue,
-            ScriptLoader::AllowLegacyTypeInTypeAttribute))
-      request->setScriptHasInvalidTypeOrLanguage();
     return request;
   }
 
  private:
   template <typename NameType>
   void processScriptAttribute(const NameType& attributeName,
                               const String& attributeValue) {
     // FIXME - Don't set crossorigin multiple times.
     if (match(attributeName, srcAttr))
       setUrlToLoad(attributeValue, DisallowURLReplacement);
@@ skipping 205 matching lines @@
   bool shouldPreload() const {
     if (m_urlToLoad.isEmpty())
       return false;
     if (!m_matched)
       return false;
     if (match(m_tagImpl, linkTag) && !m_linkIsStyleSheet && !m_linkIsImport &&
         !m_linkIsPreload)
       return false;
     if (match(m_tagImpl, inputTag) && !m_inputIsImage)
       return false;
+    if (match(m_tagImpl, scriptTag) &&
+        !ScriptLoader::isValidScriptTypeAndLanguage(
+            m_typeAttributeValue, m_languageAttributeValue,
+            ScriptLoader::AllowLegacyTypeInTypeAttribute)) {
+      return false;
+    }
     return true;
   }
 
   void setCrossOrigin(const String& corsSetting) {
     m_crossOrigin = crossOriginAttributeValue(corsSetting);
   }
 
   void setNonce(const String& nonce) { m_nonce = nonce; }
 
   void setDefer(FetchRequest::DeferOption defer) { m_defer = defer; }
@@ skipping 398 matching lines @@
   defaultViewportMinWidth = document->viewportDefaultMinWidth();
   viewportMetaZeroValuesQuirk =
       document->settings() &&
       document->settings()->viewportMetaZeroValuesQuirk();
   viewportMetaEnabled =
       document->settings() && document->settings()->viewportMetaEnabled();
   referrerPolicy = document->getReferrerPolicy();
 }
 
 }  // namespace blink