Changeset 254970 in webkit

Timestamp:

Jan 23, 2020 1:51:58 AM (4 years ago)

Author:

ysuzuki@apple.com

Message:

nomodule scripts are fetched in some cases (with empty cache or in new tab)
​https://bugs.webkit.org/show_bug.cgi?id=194337
<rdar://problem/49700924>

Reviewed by Ryosuke Niwa.

Source/WebCore:

The preloader attempt to preload "src" of script tags. However, script tag attributed with "nomodule"
will never be executed by WebKit since it already supports modules. Avoid loading this content in
the preloader.

Test: http/wpt/preload/classic-script-with-nomodule.html

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
(WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):

LayoutTests:

• http/wpt/preload/classic-script-with-nomodule-expected.txt: Added.
• http/wpt/preload/classic-script-with-nomodule.html: Added.
• http/wpt/preload/resources/classic.js: Added.
• http/wpt/preload/resources/module.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/preload/classic-script-with-nomodule-expected.txt (added)
• LayoutTests/http/wpt/preload/classic-script-with-nomodule.html (added)
• LayoutTests/http/wpt/preload/resources/classic.js (added)
• LayoutTests/http/wpt/preload/resources/module.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-01-23  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        nomodule scripts are fetched in some cases (with empty cache or in new tab)
+        https://bugs.webkit.org/show_bug.cgi?id=194337
+        <rdar://problem/49700924>
+
+        Reviewed by Ryosuke Niwa.
+
+        * http/wpt/preload/classic-script-with-nomodule-expected.txt: Added.
+        * http/wpt/preload/classic-script-with-nomodule.html: Added.
+        * http/wpt/preload/resources/classic.js: Added.
+        * http/wpt/preload/resources/module.js: Added.
+
 2020-01-22  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-23  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        nomodule scripts are fetched in some cases (with empty cache or in new tab)
+        https://bugs.webkit.org/show_bug.cgi?id=194337
+        <rdar://problem/49700924>
+
+        Reviewed by Ryosuke Niwa.
+
+        The preloader attempt to preload "src" of script tags. However, script tag attributed with "nomodule"
+        will never be executed by WebKit since it already supports modules. Avoid loading this content in
+        the preloader.
+
+        Test: http/wpt/preload/classic-script-with-nomodule.html
+
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+        (WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
+
 2020-01-22  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -243 +243 @@
                 m_referrerPolicy = parseReferrerPolicy(attributeValue, ReferrerPolicySource::ReferrerPolicyAttribute).valueOr(ReferrerPolicy::EmptyString);
                 break;
+            } else if (match(attributeName, nomoduleAttr)) {
+                m_scriptIsNomodule = true;
+                break;
             }
             processImageAndScriptAttribute(attributeName, attributeValue);
@@ -353 +356 @@
             return false;
 
+        if (m_tagId == TagId::Script && m_moduleScript == PreloadRequest::ModuleScript::No && m_scriptIsNomodule)
+            return false;
+
         return true;
     }
@@ -374 +380 @@
     bool m_metaIsDisabledAdaptations;
     bool m_inputIsImage;
+    bool m_scriptIsNomodule { false };
     float m_deviceScaleFactor;
     PreloadRequest::ModuleScript m_moduleScript { PreloadRequest::ModuleScript::No };