Implement <script nomodule>

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 126 matching lines @@
 
  public:
   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) {
     if (Match(tag_impl_, imgTag) || Match(tag_impl_, sourceTag)) {
       source_size_ = SizesAttributeParser(media_values_, String()).length();
       return;
@@ skipping 125 matching lines @@
     // different metadata (including empty) from the metadata on the request.
     // See the comment before the call to mustRefetchDueToIntegrityMismatch() in
     // Source/core/fetch/ResourceFetcher.cpp for a more complete explanation.
     else if (Match(attribute_name, integrityAttr))
       SubresourceIntegrity::ParseIntegrityAttribute(attribute_value,
                                                     integrity_metadata_);
     else if (Match(attribute_name, typeAttr))
       type_attribute_value_ = attribute_value;
     else if (Match(attribute_name, languageAttr))
       language_attribute_value_ = attribute_value;
+    else if (Match(attribute_name, nomoduleAttr))
+      nomodule_attribute_value_ = true;
   }
 
   template <typename NameType>
   void ProcessImgAttribute(const NameType& attribute_name,
                            const String& attribute_value) {
     if (Match(attribute_name, srcAttr) && img_src_url_.IsNull()) {
       img_src_url_ = attribute_value;
       SetUrlToLoad(BestFitSourceForImageAttributes(
                        media_values_->DevicePixelRatio(), source_size_,
                        attribute_value, srcset_image_candidate_),
@@ skipping 212 matching lines @@
 
   bool ShouldPreload(WTF::Optional<Resource::Type>& type) const {
     if (url_to_load_.IsEmpty())
       return false;
     if (!matched_)
       return false;
     if (Match(tag_impl_, linkTag))
       return ShouldPreloadLink(type);
     if (Match(tag_impl_, inputTag) && !input_is_image_)
       return false;
     ScriptType script_type = ScriptType::kClassic;

[hiroshige, 2017/04/19 21:15:33]

nit: this declaration can be moved inside if() block below.

[Nate Chapin, 2017/04/19 21:54:32]

Done.

-    if (Match(tag_impl_, scriptTag) &&
-        !ScriptLoader::IsValidScriptTypeAndLanguage(
-            type_attribute_value_, language_attribute_value_,
-            ScriptLoader::kAllowLegacyTypeInTypeAttribute, script_type)) {
-      return false;
+    if (Match(tag_impl_, scriptTag)) {
+      if (!ScriptLoader::IsValidScriptTypeAndLanguage(
+              type_attribute_value_, language_attribute_value_,
+              ScriptLoader::kAllowLegacyTypeInTypeAttribute, script_type)) {
+        return false;
+      }
+      if (ScriptLoader::BlockForNoModule(script_type,
+                                         nomodule_attribute_value_)) {
+        return false;
+      }
     }
     return true;
   }
 
   void SetCrossOrigin(const String& cors_setting) {
     cross_origin_ = GetCrossOriginAttributeValue(cors_setting);
   }
 
   void SetNonce(const String& nonce) { nonce_ = nonce; }
 
   void SetDefer(FetchParameters::DeferOption defer) { defer_ = defer; }
 
   bool Defer() const { return defer_; }
 
   const StringImpl* tag_impl_;
   String url_to_load_;
   ImageCandidate srcset_image_candidate_;
   String charset_;
   bool link_is_style_sheet_;
   bool link_is_preconnect_;
   bool link_is_preload_;
   bool link_is_import_;
   bool matched_;
   bool input_is_image_;
   String img_src_url_;
   String srcset_attribute_value_;
   String as_attribute_value_;
   String type_attribute_value_;
   String language_attribute_value_;
+  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_;
 };
@@ skipping 367 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