Changeset 268872 in webkit

Timestamp:

Oct 22, 2020, 11:06:44 AM (6 years ago)

Author:

youenn@apple.com

Message:

Introduce worklet destinations and allow to fetch modules with CORS based on destination
​https://bugs.webkit.org/show_bug.cgi?id=218019
<rdar://problem/70526201>

Reviewed by Chris Dumez.

Source/WebCore:

Add support for audioworklet and paintworklet fetch destinations.
In case of those destinations, use cors mode instead of same-origin mode when fetching worklet top level module.

Test: http/wpt/webaudio/audioworklet-addModule-cors.sub.https.html

• Modules/fetch/FetchRequest.idl:
• loader/FetchOptions.h:

(WebCore::isScriptLikeDestination):

• workers/WorkerScriptLoader.cpp:

(WebCore::WorkerScriptLoader::loadAsynchronously):

• worklets/WorkletGlobalScope.cpp:

(WebCore::WorkletGlobalScope::processNextScriptFetchJobIfNeeded):

Source/WebKit:

Add support to new fetch destinations in enumerations.

• NetworkProcess/NetworkLoadChecker.cpp:

(WebKit::NetworkLoadChecker::isAllowedByContentSecurityPolicy):

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::resourceLoadInfo):

LayoutTests:

• http/wpt/webaudio/audioworklet-addModule-cors.sub.https-expected.txt: Added.
• http/wpt/webaudio/audioworklet-addModule-cors.sub.https.html: Added.
• http/wpt/webaudio/resources/dummy-worklet.py: Added.

(main):
(DummyProcessor):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/webaudio/audioworklet-addModule-cors.sub.https-expected.txt (added)
• LayoutTests/http/wpt/webaudio/audioworklet-addModule-cors.sub.https.html (added)
• LayoutTests/http/wpt/webaudio/resources/dummy-worklet.py (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/fetch/FetchRequest.idl (modified) (1 diff)
• Source/WebCore/loader/FetchOptions.h (modified) (4 diffs)
• Source/WebCore/workers/WorkerScriptLoader.cpp (modified) (1 diff)
• Source/WebCore/worklets/WorkletGlobalScope.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-22  Youenn Fablet  <youenn@apple.com>
+
+        Introduce worklet destinations and allow to fetch modules with CORS based on destination
+        https://bugs.webkit.org/show_bug.cgi?id=218019
+        <rdar://problem/70526201>
+
+        Reviewed by Chris Dumez.
+
+        * http/wpt/webaudio/audioworklet-addModule-cors.sub.https-expected.txt: Added.
+        * http/wpt/webaudio/audioworklet-addModule-cors.sub.https.html: Added.
+        * http/wpt/webaudio/resources/dummy-worklet.py: Added.
+        (main):
+        (DummyProcessor):
+
 2020-10-22  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-22  Youenn Fablet  <youenn@apple.com>
+
+        Introduce worklet destinations and allow to fetch modules with CORS based on destination
+        https://bugs.webkit.org/show_bug.cgi?id=218019
+        <rdar://problem/70526201>
+
+        Reviewed by Chris Dumez.
+
+        Add support for audioworklet and paintworklet fetch destinations.
+        In case of those destinations, use cors mode instead of same-origin mode when fetching worklet top level module.
+
+        Test: http/wpt/webaudio/audioworklet-addModule-cors.sub.https.html
+
+        * Modules/fetch/FetchRequest.idl:
+        * loader/FetchOptions.h:
+        (WebCore::isScriptLikeDestination):
+        * workers/WorkerScriptLoader.cpp:
+        (WebCore::WorkerScriptLoader::loadAsynchronously):
+        * worklets/WorkletGlobalScope.cpp:
+        (WebCore::WorkletGlobalScope::processNextScriptFetchJobIfNeeded):
+
 2020-10-22  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/Modules/fetch/FetchRequest.idl

@@ -27 +27 @@
  */
 
-enum FetchRequestDestination { "", "audio", "document", "embed", "font", "image", "manifest", "object", "report", "script", "serviceworker", "sharedworker", "style", "track", "video", "worker", "xslt" };
+enum FetchRequestDestination { "", "audio", "audioworklet", "document", "embed", "font", "image", "manifest", "object", "paintworklet", "report", "script", "serviceworker", "sharedworker", "style", "track", "video", "worker", "xslt" };
 
 typedef (FetchRequest or USVString) RequestInfo;

trunk/Source/WebCore/loader/FetchOptions.h

@@ -37 +37 @@
 
 struct FetchOptions {
-    enum class Destination : uint8_t { EmptyString, Audio, Document, Embed, Font, Image, Manifest, Object, Report, Script, Serviceworker, Sharedworker, Style, Track, Video, Worker, Xslt };
+    enum class Destination : uint8_t { EmptyString, Audio, Audioworklet, Document, Embed, Font, Image, Manifest, Object, Paintworklet, Report, Script, Serviceworker, Sharedworker, Style, Track, Video, Worker, Xslt };
     enum class Mode : uint8_t { Navigate, SameOrigin, NoCors, Cors };
     enum class Credentials : uint8_t { Omit, SameOrigin, Include };
@@ -92 +92 @@
 inline bool isScriptLikeDestination(FetchOptions::Destination destination)
 {
-    return destination == FetchOptions::Destination::Script
+    return destination == FetchOptions::Destination::Audioworklet
+        || destination == FetchOptions::Destination::Paintworklet
+        || destination == FetchOptions::Destination::Script
         || destination == FetchOptions::Destination::Serviceworker
         || destination == FetchOptions::Destination::Worker;
@@ -106 +108 @@
         WebCore::FetchOptions::Destination::EmptyString,
         WebCore::FetchOptions::Destination::Audio,
+        WebCore::FetchOptions::Destination::Audioworklet,
         WebCore::FetchOptions::Destination::Document,
         WebCore::FetchOptions::Destination::Embed,
@@ -112 +115 @@
         WebCore::FetchOptions::Destination::Manifest,
         WebCore::FetchOptions::Destination::Object,
+        WebCore::FetchOptions::Destination::Paintworklet,
         WebCore::FetchOptions::Destination::Report,
         WebCore::FetchOptions::Destination::Script,

trunk/Source/WebCore/workers/WorkerScriptLoader.cpp

@@ -120 +120 @@
         return;
 
-    // Only used for loading worker scripts in classic mode.
+    // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
+    ASSERT(fetchOptions.mode == FetchOptions::Mode::SameOrigin || (fetchOptions.destination != FetchOptions::Destination::Serviceworker && fetchOptions.destination != FetchOptions::Destination::Worker));
+
+    ThreadableLoaderOptions options { WTFMove(fetchOptions) };
     // FIXME: We should add an option to set credential mode.
-    ASSERT(fetchOptions.mode == FetchOptions::Mode::SameOrigin);
-
-    ThreadableLoaderOptions options { WTFMove(fetchOptions) };
     options.credentials = FetchOptions::Credentials::SameOrigin;
     options.sendLoadCallbacks = SendCallbackPolicy::SendCallbacks;

trunk/Source/WebCore/worklets/WorkletGlobalScope.cpp

@@ -172 +172 @@
 
     FetchOptions fetchOptions;
-    fetchOptions.mode = FetchOptions::Mode::SameOrigin;
+    fetchOptions.mode = FetchOptions::Mode::Cors;
     fetchOptions.cache = FetchOptions::Cache::Default;
     fetchOptions.redirect = FetchOptions::Redirect::Follow;
-    fetchOptions.destination = FetchOptions::Destination::Worker;
     fetchOptions.credentials = scriptFetchJob.credentials;
+#if ENABLE(WEB_AUDIO)
+    if (isAudioWorkletGlobalScope())
+        fetchOptions.destination = FetchOptions::Destination::Audioworklet;
+#endif
+#if ENABLE(CSS_PAINTING_API)
+    if (isPaintWorkletGlobalScope())
+        fetchOptions.destination = FetchOptions::Destination::Paintworklet;
+#endif
 
     auto contentSecurityPolicyEnforcement = shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceChildSrcDirective;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-22  Youenn Fablet  <youenn@apple.com>
+
+        Introduce worklet destinations and allow to fetch modules with CORS based on destination
+        https://bugs.webkit.org/show_bug.cgi?id=218019
+        <rdar://problem/70526201>
+
+        Reviewed by Chris Dumez.
+
+        Add support to new fetch destinations in enumerations.
+
+        * NetworkProcess/NetworkLoadChecker.cpp:
+        (WebKit::NetworkLoadChecker::isAllowedByContentSecurityPolicy):
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::resourceLoadInfo):
+
 2020-10-22  Nitzan Uziely  <linkgoron@gmail.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp

@@ -309 +309 @@
     auto redirectResponseReceived = isRedirected() ? ContentSecurityPolicy::RedirectResponseReceived::Yes : ContentSecurityPolicy::RedirectResponseReceived::No;
     switch (m_options.destination) {
+    case FetchOptions::Destination::Audioworklet:
+    case FetchOptions::Destination::Paintworklet:
     case FetchOptions::Destination::Worker:
     case FetchOptions::Destination::Serviceworker:

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -381 +381 @@
         case WebCore::FetchOptions::Destination::Audio:
             return ResourceLoadInfo::Type::Media;
+        case WebCore::FetchOptions::Destination::Audioworklet:
+            return ResourceLoadInfo::Type::Other;
         case WebCore::FetchOptions::Destination::Document:
             return ResourceLoadInfo::Type::Document;
@@ -393 +395 @@
         case WebCore::FetchOptions::Destination::Object:
             return ResourceLoadInfo::Type::Object;
+        case WebCore::FetchOptions::Destination::Paintworklet:
+            return ResourceLoadInfo::Type::Other;
         case WebCore::FetchOptions::Destination::Report:
             return ResourceLoadInfo::Type::CSPReport;