diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini
index 40444df4791..8a7b9d49c10 100644
--- a/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-fonts/variations/font-weight-matching.html.ini
@@ -2,9 +2,6 @@
   [Test @font-face matching for weight 99]
     expected: FAIL
 
-  [Test @font-face matching for weight 420]
-    expected: FAIL
-
   [Test @font-face matching for weight 600]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 632078efe1f..aa18bf54293 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,12 +315,12 @@
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 8456d88e4f3..e67f0406fc3 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,12 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
-  [separate text/javascript; charset=windows-1252 text/javascript]
-    expected: FAIL
-
-  [separate text/javascript;charset=windows-1252  text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
index d7f85e71c3e..75e15af853d 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
@@ -1,5 +1,5 @@
 [parent-yes-1-no-same-2-no-subdomain.sub.https.html]
-  expected: TIMEOUT
+  expected: CRASH
   [after parent: originAgentCluster must equal true]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2b6af33d8..f29162631b3 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
index 2980c16c24d..38e2a102c74 100644
--- a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
@@ -3459,3 +3459,15 @@
   [HTMLMediaElement interface: document.createElement("video") must inherit property "preservesPitch" with the proper type]
     expected: FAIL
 
+  [HTMLSourceElement interface: attribute width]
+    expected: FAIL
+
+  [HTMLSourceElement interface: attribute height]
+    expected: FAIL
+
+  [HTMLSourceElement interface: document.createElement("source") must inherit property "width" with the proper type]
+    expected: FAIL
+
+  [HTMLSourceElement interface: document.createElement("source") must inherit property "height" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 3538891dae8..d81ae5a4949 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,14 +4,14 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/tables/table-column-width.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
new file mode 100644
index 00000000000..83c8f68a2e7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
@@ -0,0 +1,2 @@
+[table-column-width.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
index 82574a53e6d..047f58e103f 100644
--- a/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
@@ -2,3 +2,36 @@
   [Computed style]
     expected: FAIL
 
+  [source width and height attributes are used to infer aspect-ratio in <picture>]
+    expected: FAIL
+
+  [Computed style for width/height/aspect-ratio]
+    expected: FAIL
+
+  [Source width/height should take precedence over img attributes.]
+    expected: FAIL
+
+  [Make sure style gets invalidated correctly when the source gets removed.]
+    expected: FAIL
+
+  [If the <source> has only one of width/height, we don't get an aspect ratio, even if the <img> has both.]
+    expected: FAIL
+
+  [If we don't have width/height on the source, we fall back to width/height on the <img>.]
+    expected: FAIL
+
+  [If we only have one width/height attribute, we should get that attribute mapped but no aspect ratio, even if <img> has attributes.]
+    expected: FAIL
+
+  [Dynamically changing width/height should change computed style]
+    expected: FAIL
+
+  [Changing which <source> matches should change computed style]
+    expected: FAIL
+
+  [Percentages on source should be ignored for aspect-ratio but used for width/height.]
+    expected: FAIL
+
+  [Trailing garbage should be ignored but not make the attribute invalid]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index d913fcbb129..3080be9afc0 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 7a36937927c..7d2b5231af2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index b3643f7f51e..1f889a84dea 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,57 +2,75 @@
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
+  [textarea: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index b1aa0f1f1c4..23fb39e544c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,13 +1,14 @@
 [htmlanchorelement_noopener.html]
+  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html.ini
new file mode 100644
index 00000000000..be4871794dc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html.ini
@@ -0,0 +1,2 @@
+[dynamic-import-with-assertion-argument.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index a9677391662..00000000000
--- a/tests/wpt/metadata-layout-2020/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/bidi/new_session/connect.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/bidi/new_session/connect.py.ini
index 9bc73194a05..dc5fb114d54 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/bidi/new_session/connect.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/bidi/new_session/connect.py.ini
@@ -11,3 +11,9 @@
   [test_bidi_session_3[capabilities0-True\]]
     expected: ERROR
 
+  [test_bidi_session_send]
+    expected: ERROR
+
+  [test_bidi_session_with_different_capability[capabilities0\]]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
index b4d4b898636..9d262275083 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,9 +2,3 @@
   [test_element_in_object]
     expected: FAIL
 
-  [test_array_in_object]
-    expected: FAIL
-
-  [test_object_in_array]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bfd4d6dd2d6..bf2a1d61bab 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,5 +1,4 @@
 [import-in-moduleworker.html]
-  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 333edb3a26e..650c91da4a6 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,4 +1,5 @@
 [sharedworker-in-worker.html]
+  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 50d91009b4c..31e40e68d60 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -1285,6 +1285,13 @@
     ]
    },
    "shadow-dom": {
+    "event-on-pseudo-element-crash.html": [
+     "56674b6cdc6b5849f656696f07a038a10bf26d8a",
+     [
+      null,
+      {}
+     ]
+    ],
     "nested-slot-remove-crash.html": [
      "d53b3b40e126b6cf2d419117751d62b8f1d6f874",
      [
@@ -12688,6 +12695,13 @@
      ]
     },
     "css-writing-modes": {
+     "alt-display-vertical-001-manual.html": [
+      "2e9de77ccb0e24f562c9b3f5bf6bccc3acef8870",
+      [
+       null,
+       {}
+      ]
+     ],
      "background-position-vlr-003.xht": [
       "6211c6fde021dfe6bbce34229f279e77d281c615",
       [
@@ -12877,6 +12891,13 @@
        {}
       ]
      ],
+     "tooltip-display-vertical-001-manual.html": [
+      "0ad209aeb5bcca80c11f94a31c88a205fda34094",
+      [
+       null,
+       {}
+      ]
+     ],
      "writing-mode-vlr-001-manual.html": [
       "ac5adb13f4e3dc843f6ae5d70a6b35c01566ec56",
       [
@@ -14940,6 +14961,20 @@
          {}
         ]
        ],
+       "events-non-draggable-001-manual.html": [
+        "0315ccdc86aa8fcd767965064fed8482f45edb0f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "events-non-draggable-002-manual.html": [
+        "c890cb482ea98be5c7c1ac19fffa2f7e199264e6",
+        [
+         null,
+         {}
+        ]
+       ],
        "events-suite-manual.html": [
         "16c6583dc82a7079efdc071686983d680c9ae387",
         [
@@ -14973,6 +15008,80 @@
         ]
        }
       },
+      "platform": {
+       "close-drag-001-manual.html": [
+        "fc8db3db7d73abed1dc2d0f4719baee840062896",
+        [
+         null,
+         {}
+        ]
+       ],
+       "close-drag-002-manual.html": [
+        "35e8a5a5370f470834d3ad3a3aa8a0092a0063c6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "close-drag-003-manual.html": [
+        "7a118a2208bd02c4c25ecc5523f35f589bc558b5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "close-drag-004-manual.html": [
+        "c93f5a3508810f748c3aaa8c22153f4a06fa2502",
+        [
+         null,
+         {}
+        ]
+       ],
+       "close-drag-005-manual.html": [
+        "1a364113a3933ac391343cb6ab86cf3cde729419",
+        [
+         null,
+         {}
+        ]
+       ],
+       "close-drag-006-manual.html": [
+        "12f95349e8f3d8d23677a00a8874853b8503d74f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "drag-keypress-manual.html": [
+        "113c10dc686cb8e4e973a50b3003bfcb2f25d09c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "drag-link-manual.html": [
+        "2da41950831aba658cf06b23d1d81e746184b504",
+        [
+         null,
+         {}
+        ]
+       ],
+       "drag-to-title-manual.html": [
+        "fee1299b838c89ec33d02d25d4d728e72c0e0429",
+        [
+         null,
+         {}
+        ]
+       ],
+       "modifiers": {
+        "releasemodifiersdrag-manual.html": [
+         "91c0c584bb546451b50f8cc80afedb592b7e0b87",
+         [
+          null,
+          {}
+         ]
+        ]
+       }
+      },
       "synthetic": {
        "005-manual.html": [
         "4e0b00dab2b0c290be4785051bcde17990b3f9e8",
@@ -188886,6 +188995,32 @@
        {}
       ]
      ],
+     "intrinsic-percent-replaced-010.html": [
+      "c0a8186f86af1496e1620f063b843350adc4862e",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/intrinsic-percent-replaced-010-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-011.html": [
+      "4c0a11fd9aabba725409c6bb527994e7c18ac897",
+      [
+       null,
+       [
+        [
+         "/css/css-sizing/intrinsic-percent-replaced-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "intrinsic-percent-replaced-dynamic-001.html": [
       "1128ffa1759f26011c0639d8b5f498322c6396ac",
       [
@@ -189722,6 +189857,19 @@
        {}
       ]
      ],
+     "collapsed-border-positioned-tr-td.html": [
+      "d5c6094497268941071e516073a54f38e5900d45",
+      [
+       null,
+       [
+        [
+         "/css/css-tables/collapsed-border-positioned-tr-td-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "dynamic-table-cell-height.html": [
       "f6cd48e5ba5616a499809293714fcbb5b5742489",
       [
@@ -266117,11 +266265,11 @@
        []
       ],
       "generate.py": [
-       "7710a824b2dc19bd76203f4d64ef7b329fd1ca35",
+       "01103a232b697f94cf5c1173ba84eb32a519a085",
        []
       ],
       "spec.src.json": [
-       "5c8f97ad2eef22a41dc48618e8fe53b913c259a4",
+       "0a46a1cd6d3182193cb13f08c61c1dff41f567f5",
        []
       ],
       "spec_validator.py": [
@@ -266147,7 +266295,7 @@
        ]
       },
       "util.py": [
-       "0274f8af0b5fe87d80fa784c276b3cce5a4dcb26",
+       "1233ffbc0ecc973853e4faa82ac5698ad0456060",
        []
       ]
      },
@@ -284686,6 +284834,540 @@
       ]
      }
     },
+    "gen": {
+     "top.http-rp": {
+      "script-src-self": {
+       "script-tag.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "script-tag.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-classic.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-classic.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-import-data.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-import-data.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-import.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-import.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-module.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "sharedworker-module.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-classic.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-classic.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-import-data.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-import-data.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-import.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-import.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-module.http.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worker-module.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-animation-import-data.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-animation.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-audio-import-data.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-audio.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-layout-import-data.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-layout.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-paint-import-data.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ],
+       "worklet-paint.https.html.headers": [
+        "32b65539e69ba07001b62f2574fbeaccc13b2236",
+        []
+       ]
+      },
+      "script-src-wildcard": {
+       "script-tag.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "script-tag.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-classic.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-classic.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-import-data.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-import-data.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-import.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-import.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-module.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "sharedworker-module.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-classic.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-classic.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-import-data.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-import-data.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-import.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-import.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-module.http.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worker-module.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-animation-import-data.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-animation.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-audio-import-data.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-audio.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-layout-import-data.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-layout.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-paint-import-data.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ],
+       "worklet-paint.https.html.headers": [
+        "cbc7a1b54f7ad52e9d6ae924483c040104f881af",
+        []
+       ]
+      },
+      "worker-src-none": {
+       "script-tag.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "script-tag.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-classic.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-classic.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-import-data.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-import-data.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-import.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-import.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-module.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "sharedworker-module.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-classic.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-classic.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-import-data.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-import-data.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-import.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-import.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-module.http.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worker-module.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-animation-import-data.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-animation.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-audio-import-data.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-audio.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-layout-import-data.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-layout.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-paint-import-data.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ],
+       "worklet-paint.https.html.headers": [
+        "c75aa51ab414505f610344c00f899c6f8204827b",
+        []
+       ]
+      },
+      "worker-src-self": {
+       "script-tag.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "script-tag.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-classic.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-classic.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-import-data.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-import-data.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-import.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-import.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-module.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "sharedworker-module.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-classic.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-classic.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-import-data.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-import-data.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-import.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-import.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-module.http.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worker-module.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-animation-import-data.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-animation.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-audio-import-data.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-audio.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-layout-import-data.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-layout.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-paint-import-data.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ],
+       "worklet-paint.https.html.headers": [
+        "d55f863f727274371606d214d792b9dba0c3dabc",
+        []
+       ]
+      },
+      "worker-src-wildcard": {
+       "script-tag.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "script-tag.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-classic.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-classic.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-import-data.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-import-data.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-import.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-import.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-module.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "sharedworker-module.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-classic.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-classic.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-import-data.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-import-data.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-import.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-import.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-module.http.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worker-module.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-animation-import-data.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-animation.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-audio-import-data.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-audio.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-layout-import-data.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-layout.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-paint-import-data.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ],
+       "worklet-paint.https.html.headers": [
+        "59e5c0fc4a31a4b09f371fa1a504c16127a32f73",
+        []
+       ]
+      }
+     }
+    },
     "generic": {
      "cspro-not-enforced-in-worker.html.sub.headers": [
       "877e192bbff2204ddf56f83e411f17bfb6adab89",
@@ -284753,6 +285435,10 @@
        []
       ]
      },
+     "test-case.sub.js": [
+      "6cb262be0f5aaf30f9445835b827ed5a58e2f993",
+      []
+     ],
      "unreached.js": [
       "893fb5eba10c4bc6330ac3a09b6240e450460de2",
       []
@@ -285466,6 +286152,10 @@
       []
      ]
     },
+    "spec.src.json": [
+     "befedad087b0f90703ecc4a0d8a7174f587f54c6",
+     []
+    ],
     "style-src": {
      "resources": {
       "allowed.css": [
@@ -286045,35 +286735,9 @@
      []
     ],
     "README.md": [
-     "f641b61971e8b09de644476d2e04a1e45890b633",
+     "266c1435f079fae61028cae8cfafe30ac1901640",
      []
-    ],
-    "resources": {
-     "support.js": [
-      "685d656e9e2fdd0873ec6a984b3b939b360c22ef",
-      []
-     ],
-     "title.html": [
-      "a3a324a15fdc0de7588c2935e50f246662e18820",
-      []
-     ],
-     "treat-as-public-address.html": [
-      "a3a324a15fdc0de7588c2935e50f246662e18820",
-      []
-     ],
-     "treat-as-public-address.html.headers": [
-      "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
-      []
-     ],
-     "treat-as-public-address.https.html": [
-      "a3a324a15fdc0de7588c2935e50f246662e18820",
-      []
-     ],
-     "treat-as-public-address.https.html.headers": [
-      "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
-      []
-     ]
-    }
+    ]
    },
    "credential-management": {
     "META.yml": [
@@ -324419,6 +325083,14 @@
       "df854d75fcaa381ad51912f3c282b179db478fbf",
       []
      ],
+     "intrinsic-percent-replaced-010-ref.html": [
+      "761f18c3f635ef5ed12ef8dafff0f10363a25313",
+      []
+     ],
+     "intrinsic-percent-replaced-011-ref.html": [
+      "29a0fe8013dcbda6c44369794dfe6e7cde21c1a8",
+      []
+     ],
      "max-content-input-001-ref.html": [
       "c01e46550a7f0b5b92321d5893a8fe2a1ea0c9ac",
       []
@@ -324887,6 +325559,10 @@
       "ab9d83927458d5b9881b07bc7fd8a1d31e471b33",
       []
      ],
+     "collapsed-border-positioned-tr-td-ref.html": [
+      "b3099017699bb83d78bf0492c9c451ccd1e034bf",
+      []
+     ],
      "floats": {
       "floats-wrap-bfc-006b-ref.xht": [
        "93cdd3e51cab23bd4f20fb1794ae7eeeb5ff21b1",
@@ -337756,7 +338432,7 @@
       []
      ],
      "server-features.md": [
-      "fe3e84836c21e31583ed1c5d244f8dc85a3cf7eb",
+      "d740992bc4703d5f7ac15431c1e04148e28211df",
       []
      ],
      "server-pipes.md": [
@@ -341093,6 +341769,14 @@
      }
     },
     "cors-rfc1918": {
+     "META.yml": [
+      "6a7359c01bbd223c876463d5f379335d4c7e357c",
+      []
+     ],
+     "README.md": [
+      "5ee9c8a01e8172480533a55e392ece4198e50939",
+      []
+     ],
      "resources": {
       "support.js": [
        "be49c515ef5422743e618e67a420bd048abce89c",
@@ -345794,11 +346478,11 @@
       ],
       "resources": {
        "common.js": [
-        "be6bb0ea5f65851543acd4dcd81afd2704ade227",
+        "45fd93503c0ede4a07014997b0c0f04095b1cf6a",
         []
        ],
        "dispatcher.js": [
-        "d1fd1b61d98eb87aa794574f842b52ee1f364b9c",
+        "ed0e1ce9fbca7ed6b7f347efaf1bed6027f1b700",
         []
        ],
        "dispatcher.py": [
@@ -345808,6 +346492,10 @@
        "executor.html": [
         "7a390a3d7e9916b6d6f9df6e6476e575515f8d72",
         []
+       ],
+       "iframeTest.js": [
+        "1e3038e0e26e40dfc24281584a3d9e8c2295e9e2",
+        []
        ]
       }
      },
@@ -347413,14 +348101,6 @@
         "343fc095432db49a270d4dab3098f8229bd8503a",
         []
        ],
-       "events-non-draggable-001.html": [
-        "0315ccdc86aa8fcd767965064fed8482f45edb0f",
-        []
-       ],
-       "events-non-draggable-002.html": [
-        "c890cb482ea98be5c7c1ac19fffa2f7e199264e6",
-        []
-       ],
        "helper-drag-me-input-with-circle.xhtml": [
         "966afe4400060e894550acf439ce99e31627b6f6",
         []
@@ -348349,30 +349029,6 @@
         "e5159716f4f3d1655fa7d37b3cc4a1e846a48584",
         []
        ],
-       "close-drag-001.html": [
-        "fc8db3db7d73abed1dc2d0f4719baee840062896",
-        []
-       ],
-       "close-drag-002.html": [
-        "35e8a5a5370f470834d3ad3a3aa8a0092a0063c6",
-        []
-       ],
-       "close-drag-003.html": [
-        "7a118a2208bd02c4c25ecc5523f35f589bc558b5",
-        []
-       ],
-       "close-drag-004.html": [
-        "c93f5a3508810f748c3aaa8c22153f4a06fa2502",
-        []
-       ],
-       "close-drag-005.html": [
-        "1a364113a3933ac391343cb6ab86cf3cde729419",
-        []
-       ],
-       "close-drag-006.html": [
-        "12f95349e8f3d8d23677a00a8874853b8503d74f",
-        []
-       ],
        "cursors": {
         "001.html": [
          "953927f917d2da97a3a985b3ce41fe47d627bf67",
@@ -348419,18 +349075,6 @@
          []
         ]
        },
-       "drag-keypress.html": [
-        "113c10dc686cb8e4e973a50b3003bfcb2f25d09c",
-        []
-       ],
-       "drag-link.html": [
-        "2da41950831aba658cf06b23d1d81e746184b504",
-        []
-       ],
-       "drag-to-title.html": [
-        "fee1299b838c89ec33d02d25d4d728e72c0e0429",
-        []
-       ],
        "file-drop-position.html": [
         "7657f359b63ea8ed1dcae9bb1e0cfc3972c90c0b",
         []
@@ -348602,10 +349246,6 @@
          "8c5d5334e193121a3880a73b58f89ef60cad21fb",
          []
         ],
-        "releasemodifiersdrag.html": [
-         "91c0c584bb546451b50f8cc80afedb592b7e0b87",
-         []
-        ],
         "releasemodifiersdrop.html": [
          "adaa92e8e2fe13128ad4718ab44a56c5aa3681ea",
          []
@@ -353180,6 +353820,10 @@
          "5bb9b1ddb8e648c7165a3b29ab425fc97cb81037",
          []
         ],
+        "export-hello.js": [
+         "34b58e6e126c27f840c2ebd092e3b82b095fb374",
+         []
+        ],
         "hello.js": [
          "2f348444606435700656725dbcd9a08e8e10775f",
          []
@@ -354029,6 +354673,10 @@
         "9354d4270305882f80a7110aa1fd6adb2ffc7295",
         []
        ],
+       "serve-json-then-js.py": [
+        "9610734d4449794d1eb10032a1bac75cd4523b40",
+        []
+       ],
        "serve-with-content-type.py": [
         "675b3fc3eb08c30ad051438e741cd8433e188b57",
         []
@@ -356257,7 +356905,7 @@
      []
     ],
     "html.idl": [
-     "08cc505da91ba0601ab7e31df55d2b0f7a91bd1c",
+     "6e1a4a133d76a65af27b83a6ba2c2529355c8af4",
      []
     ],
     "idle-detection.idl": [
@@ -358716,7 +359364,7 @@
     },
     "resources": {
      "support.js": [
-      "69d5fc86c835bb4e79abdcfee1416d407ae823f3",
+      "d8c0a23dba3a21ad632b223fe2bc5994753db3ab",
       []
      ]
     }
@@ -367179,7 +367827,7 @@
        []
       ],
       "safari-technology-preview.rb": [
-       "046b336cbdcb3dfc92e1dd3e5d749cb03a7a14f0",
+       "e39be996d996056d3d1c67086659791781085e8d",
        []
       ],
       "system_info.yml": [
@@ -376232,7 +376880,7 @@
         []
        ],
        "base.py": [
-        "68ba04e1a681ecdad0680a928b1e0aecb024c73f",
+        "b47d0ad26f99f68031f36294b36adcf4fb22419c",
         []
        ],
        "executorchrome.py": [
@@ -376252,7 +376900,7 @@
         []
        ],
        "executormarionette.py": [
-        "81be731b06d6e31ddf96f0ba0de4ff302e65cffa",
+        "ea4cbe12b24e73ac98f9ad02a033a3809d3f2382",
         []
        ],
        "executoropera.py": [
@@ -379237,7 +379885,7 @@
        []
       ],
       "fixtures.py": [
-       "a1cd99a5540627d751fc29e174ec7bef8d6b90ac",
+       "7cb91ca62c238eaa7907e283077699f3897f6d2e",
        []
       ],
       "helpers.py": [
@@ -403219,6 +403867,2372 @@
       ]
      ]
     },
+    "gen": {
+     "top.http-rp": {
+      "script-src-self": {
+       "script-tag.http.html": [
+        "a5505da3ecc57606b6b05f4ebf1a3b665e2d46d2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "1001b8934cbfd8da6295cea880463980d5f0d87b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "9539763e524095744ebbcbfc5e8e8aa54653a5d6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "e8f4411aa27c29966536ff10807282fb17433b52",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "dca4996e6b87df5ae11043123cf5f4e0dcb7776b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "e082a0aabdf58877d06247bb17fb595280f60cbc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "79880d3822f662a52c17e95848e57802fd488002",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "b561c096e0aca33dd0ab7c07cd92ee843d5bee84",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "a8fd6b61f44803a2aa5480feb976d476432ebcf4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "a9ccaf5f8dca9aae18bc0db1086ef28e98cd0599",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "755e1cfcc8953fbff1f279ffcd31b45fd8896015",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "f745886d17fa769edff883c2ec056da3ed073669",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "128bca9dc5c3c8fbbb8d233291ebf8a2d7bde566",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "a819b2f680ed79bbd3694b41ae66a7d056ceef92",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "c15a45c6cfa2a0c3b7401e3ecc97ef9f094dcc8f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "fb93bdec2eddcc2a95dd33e0cf57d48592354bc9",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "ae0d919833928a37bc7a462d7edf8cdd4153f1e6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "f630ea0ff1306cafc2f53821ed9725bd229cc71c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "c743fc65619f0f3082a87bcddc4f423cef61e79d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "b25544c193a83c66d1bf76c7d3c1de6a58a99e0c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "46ed3a0bf1503a8eaf891607e1c320129b4aeaed",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "57d8809f75483e0eec4d1b6f7e5916825bcb82b2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "1503c93758bb5d3b4d5c85bc9b9097f4fd2d1324",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "c3fae6d44f97bd778f35bb3f2ab970e7a91968e8",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "122cedef881ee608040236e4ae4f9784bed1d929",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "843b00e6758d02927d4995d659c7c3237344bc30",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "script-src-wildcard": {
+       "script-tag.http.html": [
+        "4a8673d320bc929f64fafe2e53aafc8c0ebd5cf7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "99d3fa4dbc1e6b9d8499b38288461d977b60fba6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "9539763e524095744ebbcbfc5e8e8aa54653a5d6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "e8f4411aa27c29966536ff10807282fb17433b52",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "dca4996e6b87df5ae11043123cf5f4e0dcb7776b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "e082a0aabdf58877d06247bb17fb595280f60cbc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "235eb3b5ea2ef715dad2415635098b538c58ff0c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "c0e60c119780d6f49dd3575230926b91f0c4d7dd",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "a8fd6b61f44803a2aa5480feb976d476432ebcf4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "a9ccaf5f8dca9aae18bc0db1086ef28e98cd0599",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "755e1cfcc8953fbff1f279ffcd31b45fd8896015",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "f745886d17fa769edff883c2ec056da3ed073669",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "128bca9dc5c3c8fbbb8d233291ebf8a2d7bde566",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "a819b2f680ed79bbd3694b41ae66a7d056ceef92",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "8e729f63bdf67c89903fcf0c0328bef2076af7fc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "ecb08bfb33f1a968d10e2af7d153df0c2f02cf58",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "ae0d919833928a37bc7a462d7edf8cdd4153f1e6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "f630ea0ff1306cafc2f53821ed9725bd229cc71c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "c743fc65619f0f3082a87bcddc4f423cef61e79d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "35f658cb06727f3fc65b001c4eceadeed9faa0ce",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "46ed3a0bf1503a8eaf891607e1c320129b4aeaed",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "e2b02e941fd10700277da9ad0a277b8838dd7b4f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "1503c93758bb5d3b4d5c85bc9b9097f4fd2d1324",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "e8c85645610b1f39a347227c5d8026d26dcb6ca0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "122cedef881ee608040236e4ae4f9784bed1d929",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "e06edb7be291a9f7e0ffe7963b14d2278f99f66d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "worker-src-none": {
+       "script-tag.http.html": [
+        "4a8673d320bc929f64fafe2e53aafc8c0ebd5cf7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "99d3fa4dbc1e6b9d8499b38288461d977b60fba6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "2cf32d1d1153d2ee31599eae3ec3e6128bb93131",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "377eeaccc727b451b75413c9bd183cf0d66f117f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "dca4996e6b87df5ae11043123cf5f4e0dcb7776b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "e082a0aabdf58877d06247bb17fb595280f60cbc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "53d060edeb1f4ae7b41a5b85291b00f5fe22425b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "3537249e429f8098aecce59b4b1e24cd51c3831a",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "8cfd3c6332b17bf67bb4a87d2ddc9934d99175f4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "5982ad0521080ad92c2edea6289cd65feb87ad44",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "403963d56185d7ab2230c769af96883980aef846",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "ceb78f54f2ed818ea184854ba4f3032d6066978d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "128bca9dc5c3c8fbbb8d233291ebf8a2d7bde566",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "a819b2f680ed79bbd3694b41ae66a7d056ceef92",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "0a5e46bcaceb06d680acb26ed88d69792d4db459",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "777ec91f9949894ab0801d8c19c351cd7beaf43d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "8e418f50b7fead5c7fecfc2cdbad322d163f62cf",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "7ebb8250cd42db8ad7a1a351156d9af55b4665a0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "e76d985825a253ba523b9d20a3638c72049bedca",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "35f658cb06727f3fc65b001c4eceadeed9faa0ce",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "88f6fa6ff8ae228caaf833fb5f7ac988bcfbe3f0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "e2b02e941fd10700277da9ad0a277b8838dd7b4f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "84d673d70658f43f6f9148ec8b89b75ac89723a5",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "e8c85645610b1f39a347227c5d8026d26dcb6ca0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "5c4c1c57b9b1d3d531797d5b670c2f43f5e6616c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "e06edb7be291a9f7e0ffe7963b14d2278f99f66d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "worker-src-self": {
+       "script-tag.http.html": [
+        "4a8673d320bc929f64fafe2e53aafc8c0ebd5cf7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "99d3fa4dbc1e6b9d8499b38288461d977b60fba6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "9539763e524095744ebbcbfc5e8e8aa54653a5d6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "e8f4411aa27c29966536ff10807282fb17433b52",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "dca4996e6b87df5ae11043123cf5f4e0dcb7776b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "e082a0aabdf58877d06247bb17fb595280f60cbc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "79880d3822f662a52c17e95848e57802fd488002",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "b561c096e0aca33dd0ab7c07cd92ee843d5bee84",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "a8fd6b61f44803a2aa5480feb976d476432ebcf4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "a9ccaf5f8dca9aae18bc0db1086ef28e98cd0599",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "755e1cfcc8953fbff1f279ffcd31b45fd8896015",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "f745886d17fa769edff883c2ec056da3ed073669",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "128bca9dc5c3c8fbbb8d233291ebf8a2d7bde566",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "a819b2f680ed79bbd3694b41ae66a7d056ceef92",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "c15a45c6cfa2a0c3b7401e3ecc97ef9f094dcc8f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "fb93bdec2eddcc2a95dd33e0cf57d48592354bc9",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "ae0d919833928a37bc7a462d7edf8cdd4153f1e6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "f630ea0ff1306cafc2f53821ed9725bd229cc71c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "e76d985825a253ba523b9d20a3638c72049bedca",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "35f658cb06727f3fc65b001c4eceadeed9faa0ce",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "88f6fa6ff8ae228caaf833fb5f7ac988bcfbe3f0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "e2b02e941fd10700277da9ad0a277b8838dd7b4f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "84d673d70658f43f6f9148ec8b89b75ac89723a5",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "e8c85645610b1f39a347227c5d8026d26dcb6ca0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "5c4c1c57b9b1d3d531797d5b670c2f43f5e6616c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "e06edb7be291a9f7e0ffe7963b14d2278f99f66d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "worker-src-wildcard": {
+       "script-tag.http.html": [
+        "4a8673d320bc929f64fafe2e53aafc8c0ebd5cf7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "99d3fa4dbc1e6b9d8499b38288461d977b60fba6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "9539763e524095744ebbcbfc5e8e8aa54653a5d6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "e8f4411aa27c29966536ff10807282fb17433b52",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "dca4996e6b87df5ae11043123cf5f4e0dcb7776b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "e082a0aabdf58877d06247bb17fb595280f60cbc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "235eb3b5ea2ef715dad2415635098b538c58ff0c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "c0e60c119780d6f49dd3575230926b91f0c4d7dd",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "a8fd6b61f44803a2aa5480feb976d476432ebcf4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "a9ccaf5f8dca9aae18bc0db1086ef28e98cd0599",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "755e1cfcc8953fbff1f279ffcd31b45fd8896015",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "f745886d17fa769edff883c2ec056da3ed073669",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "128bca9dc5c3c8fbbb8d233291ebf8a2d7bde566",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "a819b2f680ed79bbd3694b41ae66a7d056ceef92",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "8e729f63bdf67c89903fcf0c0328bef2076af7fc",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "ecb08bfb33f1a968d10e2af7d153df0c2f02cf58",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "ae0d919833928a37bc7a462d7edf8cdd4153f1e6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "f630ea0ff1306cafc2f53821ed9725bd229cc71c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "e76d985825a253ba523b9d20a3638c72049bedca",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "35f658cb06727f3fc65b001c4eceadeed9faa0ce",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "88f6fa6ff8ae228caaf833fb5f7ac988bcfbe3f0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "e2b02e941fd10700277da9ad0a277b8838dd7b4f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "84d673d70658f43f6f9148ec8b89b75ac89723a5",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "e8c85645610b1f39a347227c5d8026d26dcb6ca0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "5c4c1c57b9b1d3d531797d5b670c2f43f5e6616c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "e06edb7be291a9f7e0ffe7963b14d2278f99f66d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      }
+     },
+     "top.meta": {
+      "script-src-self": {
+       "script-tag.http.html": [
+        "2490b51d2944199b9c0aa2ce2825c6fd9ae0f45e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "ce2d9dcc4064872bf19c8067d8270532dd4841ca",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "3d8a6c917d1afbec1a39c30955832873a75f50d0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "017f25415f32850afd4dd7ea17adbf677e68e5ea",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "8b65298fe2942e3c3aea4d77b4ad682f970f96d9",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "07ee2c847428a7ad1b324ce663533ad0d69f3cb8",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "1f64e8ab9d453cf8b0dbe55e3b2d6e06e94062ae",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "d91caff0005f6001be3c492da08bcf1f0bb00444",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "1645db76b49e037cf8d156ee51a66bea5a7d45de",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "1be825f89e02f79d20003e0f493ea69aa037f063",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "9c0a4f09b4e19d1bed29f593ed6009cb41af22d4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "1c05c6811383e47db592ad9472794501b0f2c060",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "9d779e5c325745269238714ac43437d5f25951ea",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "811604d52c55fb66b468f1d91735792d1be6c236",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "5d4e86c55d36092e2c973d5b47b9fb56b9af7af0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "4813ae58bbdd84d3e11c424b7b060f6e93361650",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "0fe08ca09c6d0bb4cb1c6b9a0a47d1e5a5f3c39b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "c116226abe29d34e1b72c021271e6eae92c9eff4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "d8eb6d72cb2924a918966aa524895c32e5712590",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "755ec46954ebf2455958044678c78adaf333cab9",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "bd31e5a853b0aaf2434fa54c4d411963272daf40",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "63dbc4fcbc9c368343ce4a63f65746659a52421e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "2dd7414c441806b2fdb445bd946e20b98679dc1f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "6e8ab9f3246889f96fb17ad71ec1ec1b637217b5",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "ed95e243c4af66f127b03af801d94faf38c6138c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "6619a3c6a8dba6ef891820841ce4fb176fcb8f40",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "script-src-wildcard": {
+       "script-tag.http.html": [
+        "298019cfaee1771b84362d7e3123f0056a13ba29",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "bcd9e411647da908162b6a870b1d2dcc70f9e568",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "8af7a3b337eb7b3646b040c8f7a3c4c031a89b65",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "1b52800782882064489b3989e42623b56262fa12",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "b9663e29935e6086de248bf3a35eaafb66406330",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "7f97a53c5b82767d263d210a7b5fa0f215435fec",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "f91d542671745d25cb6ad1c36805f251d7bdd85e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "0ed064fa95d1537fd278a3cfa08233d22b167906",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "b3c7e128023ee997dc481fe4028d879e97961e2d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "f2731a389efb77010a7eddf334a8e487c7d2a147",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "17ed6fc9c6acb47e1df796cea5da1c021ed53155",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "9a397d129ff66f9778afc3820d742e4ee3ff1884",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "4d4134b88f2c15832a7160bda7424e4e6ec4d8c3",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "34f4bc67fd0119f017573d9b62e5d59ed1cf753f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "ce1b63e28095665828290b2539f6c740a9c812bd",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "9f2b25ea2b5b56fdf69b08e81325bd9f3eea11d1",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "f939428700d8d5f84a14e70a5180f3e251970c1e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "df6fa84aab0b6e2bbaa6d9a7abaf90ded406eaf4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "abd386200f3db1377770b58f677b48e326055e9d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "258bebb569cd7b967a3e5ed3423688d2a4ccd070",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "4fbd224b573e9ca9a6e7167970380c8e686d1e5f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "91920cfde78f169f1a038a9b9eaad3c7bf2afe56",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "fcaaba6d1d5c6a00f0215d7e2bfdce62276f4908",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "25aa1900fc29057ca95ccbbf6f4bde8430dec9c6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "8eb2ccf20c27148f7d36675a94b286bb6f18b7c3",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "4c1c9d9442ca98121d3159259bb522521bbc0207",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "worker-src-none": {
+       "script-tag.http.html": [
+        "808f87b8afd5f69651a562e102e82a595375975c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "3984c0aca094585ea846e537651c685e8835348d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "c9a52b9e8a41e04be421fa1313c76e0b8e78124a",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "9c5d99d653475e34099f6404dd43eb721c918f7e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "67aa293d601fa9ca6887cbb0a59bbdab36a9b551",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "962656cf85840d57f53a67aeb0cbfd2fc63c97a0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "d7d3fde214db1be1b32f26efc356d888ae74398f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "a71218033ea9b12e8a476953ed27f998b543e383",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "eab9578956698ff98cea92706b0dbcb29c7af741",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "54ee491d2ce6cabdac71f6cb67ca412661cccf7b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "fb2a513be6f68de063b69510f5c472cadecec157",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "b858ab6fd3d0930db727dd3a21600f5c8643755e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "c51f5fdfc9bec74c56b4ff17d37489ec1c4cf2fd",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "ba72382263aafbb2246ecc5cfb3cabba4ebce9bd",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "ecc354b42c70727dada221d5bb1609d25d13252d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "d46f8002c76e39c015dd461d9db633fa5b100e62",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "dbb3736d8c47f7a69713ca175c96153ce197728e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "ecb46e6c5a18c432b1f560f2aaba9ce6e3a232b4",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "cd1323b7b988de20491c3ca3a3693a6e380a40a7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "56a7b38990fb1758e1c6d63c1177542b18c659b2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "4b6d27f353d6a28a0fe323f15b51f09bf7cdd416",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "230b24b0cb9a5a5965fcfb5a88124e344bc9d260",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "256d27bd5a4ba50d93506cb4d7d3c3f819cf4a8f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "f91d5994b486fcf07fda5c0343e2a00425c51182",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "0a4ce7eea93d1555fa578d144d4c6f87ffd26723",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "70d2bc43d51b03ff89b96761cecaec1888f9827b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "worker-src-self": {
+       "script-tag.http.html": [
+        "01473eca10428cf96ded7b21af222a778d59838a",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "9e2b8e4fcc0c30e3973b0804d385a142020d3c69",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "da84d477fe61daf7007743a81bd322d121b66407",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "c8a0fe096231659bec1d49d0f0dacdb743985fb3",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "53c2883a53d80e09d39b520152cb200afb04a4b0",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "88c76a0e94301e9ecff9258fb3257866cf64495c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "d758a8ea94e002c814f2b1eac315bf1d0e02d484",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "856627977e326082bb25c4f5314a2134ffdf1698",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "4f8ac90112f7b22de6cd99573a22e526a742863f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "21540178d48e5e73e73020bd7be4e0c06ee8b8e2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "3bbe1c567e0ffac4e8e134d935c74ecf171ca1e1",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "f6324c395b5c069f25df0cd3bfcf36e49e2fe4f2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "3fd637403fc5978d66aab07f05068e77a681bd34",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "44847d3730780fef1ebf3d52449eca1128fe4d6d",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "739c7dc36c4a11e3a71804c5e9de1cc043781a17",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "0b39eecc3b16d177e618d1ae31b633a34354b14a",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "bca26ecf79171b117257c641990be3a51f1ac08e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "830632fffe13c68d11ffcaf0b1279b3e946f7d54",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "ccc4ff906c937e1d7409b0b2e7686c0697b48575",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "26d075f78fdf41a60bfbe9dabda833c320a4440c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "1cd0b7cb78e6be6ba9e153d2511d4b2d53ea3365",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "02fc8f4aa7af35a76d86c3e975c3d2666ea7657f",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "e76314d86560c50e4cd454b48716fd6cbe521da2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "47c069f34916110783ffb63474e5ebd63f183d0e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "3667b8f7110a0e405481599b6e580b589ffecb62",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "f8acb0ce054f419a9ffd5aae126ce3897a686d28",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
+      "worker-src-wildcard": {
+       "script-tag.http.html": [
+        "bfde09236b71685f20c92c2e42da6bdf49a6a921",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "script-tag.https.html": [
+        "4374b3ee748d0a6635612fb1e9fe3bf5b6f19688",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.http.html": [
+        "b8f7ada43e52519becdee494ce7585f91471f923",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-classic.https.html": [
+        "5cba138c77754258ea815e6dbb72b95bd3bfb9f2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.http.html": [
+        "946e251e9a14ba8670c2e06becd24e9a930049f6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import-data.https.html": [
+        "172ef2c9820875ca369dfa239938187d567307b6",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.http.html": [
+        "e0128ae1e9ebd0d007c632ecf72cd84f0598c645",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-import.https.html": [
+        "9ecc4b4edeb47c53f05fa84bfbf330338d7c73ae",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.http.html": [
+        "60825b9f16ae43f2d7dd3503765cb8831d0a1cef",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "sharedworker-module.https.html": [
+        "4ce3dc37caaf59fc6e98f359864a321965a60f6c",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.http.html": [
+        "b0cb7ddfaf5bd2a01d117f6f65d42a53d16e6609",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-classic.https.html": [
+        "ae6eef0c91c8136c6e46fb94c78481100d976be7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.http.html": [
+        "0cc445bc9f4ff0990b30865375973dcf4ddf4f88",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import-data.https.html": [
+        "a84d5bedc8ce6d90edae86beb4e1bbc9711b1aaa",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.http.html": [
+        "2a7ceb247b07e0d08267125ede806cc63bd6bca2",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-import.https.html": [
+        "ce4a52582ddb1e72d45442df0269bce942a6ec0b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.http.html": [
+        "fd0c39f3505fa75b255c1c1b0fd55268df855177",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worker-module.https.html": [
+        "8eaab9e278cc4b62bf9ee8f504e9b88dd90c2ca7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation-import-data.https.html": [
+        "3569ae6faab6de0c8107d916d5a502c92e1e969b",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-animation.https.html": [
+        "0fa6c1f84ae4c184e7053f8669b75a9b58bf2371",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio-import-data.https.html": [
+        "dcb89228762184210eb9ab06545ba52738c39d17",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-audio.https.html": [
+        "16a020813e9d4cc86e70c9f1cc13aacade48cd69",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout-import-data.https.html": [
+        "2ef11440f2dcf6b62819e7e157d2063b9dc6d58e",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-layout.https.html": [
+        "6f85b4f0bb5716eef78194dad5e4884e8caa00fa",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint-import-data.https.html": [
+        "e1ffaaccfdbf05b79cf3dbfb3d644ba0f1ad70d3",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "worklet-paint.https.html": [
+        "27c2573a69d06e650e6f876300dacf278856a132",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ]
+      }
+     }
+    },
     "generic": {
      "304-response-should-update-csp.sub.html": [
       "b16eadaedc07ca9dbc60310d850d49ded370d22a",
@@ -407648,36 +410662,6 @@
      ]
     ]
    },
-   "cors-rfc1918": {
-    "address-space.https.window.js": [
-     "3156e3a33d378df95a5506b65ed6f31368d232ec",
-     [
-      "cors-rfc1918/address-space.https.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/support.js"
-        ]
-       ]
-      }
-     ]
-    ],
-    "address-space.window.js": [
-     "287ab956ab8f9bbbe733ba407d8f5711c853d3f4",
-     [
-      "cors-rfc1918/address-space.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "resources/support.js"
-        ]
-       ]
-      }
-     ]
-    ]
-   },
    "credential-management": {
     "credentialscontainer-create-basics.https.html": [
      "ea2326c4ae48d987f233f057a42fcf08eec6dd01",
@@ -422482,7 +425466,7 @@
     "css-sizing": {
      "animation": {
       "aspect-ratio-interpolation.html": [
-       "3c9afe06fa69893daee2e1877cd6cf75ad32ae81",
+       "3628ff607cc6731fb157c13766fe63238d2d4102",
        [
         null,
         {}
@@ -433722,7 +436706,7 @@
       ]
      ],
      "prefers-contrast.html": [
-      "fe0d2f057c31c8bd122483c8e282bc1188fc2a69",
+      "304660bdcb4b02d4bbb922c7913e74b0f55fec92",
       [
        null,
        {}
@@ -486213,6 +489197,27 @@
         {}
        ]
       ],
+      "iframe-coep-credentialless.tentative.https.html": [
+       "85d2be9a23fc4a2f9407b6d8d481a1cd1b684ee0",
+       [
+        null,
+        {}
+       ]
+      ],
+      "iframe-coep-none.tentative.https.html": [
+       "ad28c3a59172b274a58dfa32fce4fff0ac82eb93",
+       [
+        null,
+        {}
+       ]
+      ],
+      "iframe-coep-require-corp.tentative.https.html": [
+       "cb86ff239aab0f5cc998f96df5dc3f4bdc8004b6",
+       [
+        null,
+        {}
+       ]
+      ],
       "image.tentative.https.html": [
        "d0cbf472a3ce07781457967c385eb73503922f0b",
        [
@@ -490273,7 +493278,7 @@
         ]
        ],
        "picture-aspect-ratio.html": [
-        "3f4221b7148bbbb4a2fa6a695bf37c583ebd164d",
+        "74f3334890bcf876b0a359d50a48b5bf4780f20c",
         [
          null,
          {}
@@ -499083,6 +502088,13 @@
         ]
        ],
        "import-assertions": {
+        "dynamic-import-with-assertion-argument.html": [
+         "f90724f4f63f65083a0444bec9936ccbaab429a0",
+         [
+          null,
+          {}
+         ]
+        ],
         "empty-assertion-clause.html": [
          "3a7c371189c9e847327ac14f49d4ee5153f35295",
          [
@@ -499181,6 +502193,13 @@
           {}
          ]
         ],
+        "repeated-imports.html": [
+         "d1c2182102caa197a977dbbc57ed733b86ba42b8",
+         [
+          null,
+          {}
+         ]
+        ],
         "utf8.tentative.html": [
          "24a6f109e1c586fac8a00d0f2896e91ad8b5acfd",
          [
@@ -510913,6 +513932,15 @@
      ]
     ]
    },
+   "mediacapture-insertable-streams": {
+    "MediaStreamTrackGenerator-video.https.html": [
+     "e1d1565d84272c38488cdba832b63ac6b3c16118",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "mediacapture-record": {
     "BlobEvent-constructor.html": [
      "66dc3404d78020108edc823292bff9b83cda42a6",
@@ -513075,8 +516103,89 @@
     ]
    },
    "native-io": {
+    "capacity_allocation_async_basic.tentative.https.any.js": [
+     "93e2e9873a8512464344949680f318c78efa4df7",
+     [
+      "native-io/capacity_allocation_async_basic.tentative.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Acquiring, displaying and releasing capacity."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/capacity_allocation_async_basic.tentative.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Acquiring, displaying and releasing capacity."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/capacity_allocation_async_basic.tentative.https.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Acquiring, displaying and releasing capacity."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/capacity_allocation_async_basic.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Acquiring, displaying and releasing capacity."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ]
+    ],
+    "capacity_allocation_sync_basic.tentative.https.any.js": [
+     "3ec2db383efda674f5c1df16c964d57fd20da5c8",
+     [
+      "native-io/capacity_allocation_sync_basic.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Acquiring, displaying and releasing capacity."
+        ],
+        [
+         "global",
+         "dedicatedworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "close_async.tentative.https.any.js": [
-     "1a7c680084cebea00be6910306dc276378ac2050",
+     "30b46594aff85872e0b6330f7017b349292a6f8a",
      [
       "native-io/close_async.tentative.https.any.html",
       {
@@ -513175,7 +516284,7 @@
      ]
     ],
     "close_sync.tentative.https.any.js": [
-     "a0abf5ca4e05f9d7d5d3e241adb131ed4dc6bb40",
+     "c298a79ede1cacebc7805e19cae41b59c5784f39",
      [
       "native-io/close_sync.tentative.https.any.worker.html",
       {
@@ -513187,6 +516296,10 @@
         [
          "global",
          "dedicatedworker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -513194,7 +516307,7 @@
     ],
     "concurrent_io": {
      "concurrent_io_flush_async.tentative.https.any.js": [
-      "518527821e7e82ca1e3032640cea1143ae95a8f3",
+      "1eb031ce6a11e8e6dc88c0b2ab418343eb90878b",
       [
        "native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.html",
        {
@@ -513289,7 +516402,7 @@
       ]
      ],
      "concurrent_io_getLength_async.tentative.https.any.js": [
-      "d542188738e5d55377f9eefe39ea7a67fb792f54",
+      "eee22bf4d8061045a1f389c2bb2bc3d12dc0f971",
       [
        "native-io/concurrent_io/concurrent_io_getLength_async.tentative.https.any.html",
        {
@@ -513384,7 +516497,7 @@
       ]
      ],
      "concurrent_io_read_async.tentative.https.any.js": [
-      "fb98fed67ca15e6c852931b6f49e677cb6ab0a9d",
+      "bf76fb11337f9d82ad98ad2935053fcd8d9dc778",
       [
        "native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.html",
        {
@@ -513499,7 +516612,7 @@
       ]
      ],
      "concurrent_io_setLength_async.tentative.https.any.js": [
-      "2d7617d011c001fad6988c859257d643900ff07d",
+      "79f7e799596f2de9bb0397de8acbcf36182ffc3e",
       [
        "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.html",
        {
@@ -513614,7 +516727,7 @@
       ]
      ],
      "concurrent_io_write_async.tentative.https.any.js": [
-      "729bee3a08371f57a5ab73b7f6d641e63b22bb0c",
+      "2fe9cb396af0225859b5db37821e92aa6a9e3a3c",
       [
        "native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.html",
        {
@@ -513811,7 +516924,7 @@
      ]
     ],
     "flush_async_basic.tentative.https.any.js": [
-     "9219725c4c2aec5a6c4e41f2eb593027a5a7369c",
+     "d5ed466dab1a4c73eca321656715c375b373c9a4",
      [
       "native-io/flush_async_basic.tentative.https.any.html",
       {
@@ -513910,7 +517023,7 @@
      ]
     ],
     "flush_sync_basic.tentative.https.any.js": [
-     "4aa22267f61026b0a8d2f137c01bb47a718b4c7f",
+     "128dcede7a9aa7e38391fed6e0e80596f9c0669e",
      [
       "native-io/flush_sync_basic.tentative.https.any.worker.html",
       {
@@ -513932,7 +517045,7 @@
      ]
     ],
     "getLength_setLength_async_basic.tentative.https.any.js": [
-     "38ebcc29409dbf4a950039277608bef2a82cccab",
+     "bd3f9b3a148cc85276a93e2d427084592d167158",
      [
       "native-io/getLength_setLength_async_basic.tentative.https.any.html",
       {
@@ -514011,7 +517124,7 @@
      ]
     ],
     "getLength_setLength_sync_basic.tentative.https.any.js": [
-     "28057c9db7e7e17271d1b7803949a07e2bac1e06",
+     "b93ad1558101f0b98b39fe3b10b2c87b4a152d96",
      [
       "native-io/getLength_setLength_sync_basic.tentative.https.any.worker.html",
       {
@@ -514114,7 +517227,7 @@
      ]
     ],
     "read_write_async_basic.tentative.https.any.js": [
-     "a0273242144fffc1ac9948fddbf89616bb02bc2a",
+     "59e9094a0287a6e984f5deb70fa9f646fd9c8c4e",
      [
       "native-io/read_write_async_basic.tentative.https.any.html",
       {
@@ -514126,6 +517239,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514141,6 +517258,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514156,6 +517277,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514171,13 +517296,17 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
      ]
     ],
     "read_write_sync_basic.tentative.https.any.js": [
-     "61c5e3f3225f01ac3e23109dceab6c7f0146fde2",
+     "7905ff73012c9cce870e1ef4abdf77688fe87706",
      [
       "native-io/read_write_sync_basic.tentative.https.any.worker.html",
       {
@@ -514189,6 +517318,10 @@
         [
          "global",
          "dedicatedworker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514258,7 +517391,7 @@
      ]
     ],
     "rename_async_failure_handling.tentative.https.any.js": [
-     "546ba7a9ecc7c906ce7d276251fdcf49d687b304",
+     "0067f76b3527dc75f7a2241a0373a3d140eeee24",
      [
       "native-io/rename_async_failure_handling.tentative.https.any.html",
       {
@@ -514375,7 +517508,7 @@
      ]
     ],
     "rename_sync_failure_handling.tentative.https.any.js": [
-     "b86efa8acd02a693375a35f209153a11cafc58ed",
+     "583584b1d427454780ca7e2dc1ed3ad3c6ebd4e4",
      [
       "native-io/rename_sync_failure_handling.tentative.https.any.worker.html",
       {
@@ -514397,7 +517530,7 @@
      ]
     ],
     "setLength_bounds_async.tentative.https.any.js": [
-     "b00370c47f560803cc2da00a75cb14df3169f5c8",
+     "8882bf2562f7d85097aaf8b75d747d987e5bf94d",
      [
       "native-io/setLength_bounds_async.tentative.https.any.html",
       {
@@ -514476,7 +517609,7 @@
      ]
     ],
     "setLength_bounds_sync.tentative.https.any.js": [
-     "d95752fdd8e5fb292071c4853b886b5b1b65596a",
+     "99b4452be64fa59f06190121aaca7114dcfd66ff",
      [
       "native-io/setLength_bounds_sync.tentative.https.any.worker.html",
       {
@@ -514497,6 +517630,87 @@
       }
      ]
     ],
+    "setLength_capacity_allocation_async.tentative.https.any.js": [
+     "812f8555ee6214453c95fedac666565e55b1bd1d",
+     [
+      "native-io/setLength_capacity_allocation_async.tentative.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: SetLength respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/setLength_capacity_allocation_async.tentative.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: SetLength respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/setLength_capacity_allocation_async.tentative.https.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: SetLength respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/setLength_capacity_allocation_async.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: SetLength respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ]
+    ],
+    "setLength_capacity_allocation_sync.tentative.https.any.js": [
+     "6c71af5bbe0671d17b91ca6a30e711a59590efe2",
+     [
+      "native-io/setLength_capacity_allocation_sync.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: SetLength respects the allocated capacities."
+        ],
+        [
+         "global",
+         "dedicatedworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "trustworthy_origin_failure.tentative.http.any.js": [
      "42637160937582a13a06137da70b23ce70c3c26b",
      [
@@ -514530,8 +517744,89 @@
       }
      ]
     ],
+    "write_capacity_allocation_async.tentative.https.any.js": [
+     "d5d9297e2c0f431f5795b09e15b7f8c1d6b85d4a",
+     [
+      "native-io/write_capacity_allocation_async.tentative.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Write respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/write_capacity_allocation_async.tentative.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Write respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/write_capacity_allocation_async.tentative.https.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Write respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/write_capacity_allocation_async.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Write respects the allocated capacities."
+        ],
+        [
+         "global",
+         "window,worker"
+        ]
+       ]
+      }
+     ]
+    ],
+    "write_capacity_allocation_sync.tentative.https.any.js": [
+     "ff31c78edacfceb79f2fd6d81762b39ff1c42bd1",
+     [
+      "native-io/write_capacity_allocation_sync.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Write respects the allocated capacities."
+        ],
+        [
+         "global",
+         "dedicatedworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "write_getLength_async_basic.tentative.https.any.js": [
-     "5fb48acb42f2bb70cb16e625911f01c6e164cd59",
+     "428d63ebd577fa12d7d9d8b42e35011cab16111f",
      [
       "native-io/write_getLength_async_basic.tentative.https.any.html",
       {
@@ -514543,6 +517838,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514558,6 +517857,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514573,6 +517876,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -514588,13 +517895,17 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
      ]
     ],
     "write_getLength_sync_basic.tentative.https.any.js": [
-     "72b70fa69cd2fac663b61ee22be8eef057d92013",
+     "09e97fe6fe9639e1f1733f19b1260566f3146c85",
      [
       "native-io/write_getLength_sync_basic.tentative.https.any.worker.html",
       {
@@ -514606,6 +517917,10 @@
         [
          "global",
          "dedicatedworker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -536400,7 +539715,7 @@
       ]
      ],
      "fetch-event.https.html": [
-      "4c79670de37fb595326fdacf1318001ec6ae9672",
+      "5e56fe248c9ef63cc9d028c15d0de123a8304612",
       [
        null,
        {
@@ -558736,7 +562051,7 @@
      ]
     ],
     "audio-encoder.any.js": [
-     "4656ff0310193788c429b472779bebbc31da3a93",
+     "0a8b39c9204e4617f1f5ddf5d89bd0a9f3144d4c",
      [
       "webcodecs/audio-encoder.any.html",
       {
@@ -558827,6 +562142,13 @@
       }
      ]
     ],
+    "video-frame-from-video.html": [
+     "80c24cf63371982ed40d08f24bdc40611254731a",
+     [
+      null,
+      {}
+     ]
+    ],
     "video-frame-serialization.any.js": [
      "a0b28a299fbbf42711ae9b13be017cd175b29545",
      [
@@ -558869,7 +562191,7 @@
      ]
     ],
     "video-frame.any.js": [
-     "3ae10f829a0a5e248e803c0bcc258c95e8b38d21",
+     "71a73c4ee3455001105f9a5d28d3e022246af018",
      [
       "webcodecs/video-frame.any.html",
       {
@@ -595812,7 +599134,7 @@
      "bidi": {
       "new_session": {
        "connect.py": [
-        "283853562df60a19a0be38b9edf5d265ce8a973e",
+        "2b02d8ae99d830e506f34ed5c97fe4b1e2546511",
         [
          null,
          {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
index 03e1110f304..3932c11d225 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
@@ -17,9 +17,6 @@
   [Test @font-face matching for weight 399]
     expected: FAIL
 
-  [Test @font-face matching for weight 420]
-    expected: FAIL
-
   [Test @font-face matching for weight 400]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 0e5b6d06809..71eca2f732f 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,12 +315,12 @@
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 8456d88e4f3..e67f0406fc3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,12 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
-  [separate text/javascript; charset=windows-1252 text/javascript]
-    expected: FAIL
-
-  [separate text/javascript;charset=windows-1252  text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
index 99898e22a01..5a57d997ea4 100644
--- a/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
+++ b/tests/wpt/metadata/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
@@ -1,4 +1,5 @@
 [parent-yes-1-no-same-2-no-subdomain.sub.https.html]
+  expected: CRASH
   [after parent: originAgentCluster must equal true]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index fd369192a02..c757b400205 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index 92a489f7f2d..f2a27054b52 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -3771,3 +3771,15 @@
   [HTMLMediaElement interface: document.createElement("video") must inherit property "preservesPitch" with the proper type]
     expected: FAIL
 
+  [HTMLSourceElement interface: attribute width]
+    expected: FAIL
+
+  [HTMLSourceElement interface: attribute height]
+    expected: FAIL
+
+  [HTMLSourceElement interface: document.createElement("source") must inherit property "width" with the proper type]
+    expected: FAIL
+
+  [HTMLSourceElement interface: document.createElement("source") must inherit property "height" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d1ca01ebc5f..dab21cae5d8 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,11 +7,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-column-width.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
index b0c28c2b4e3..83c8f68a2e7 100644
--- a/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/tables/table-column-width.html.ini
@@ -1,2 +1,2 @@
 [table-column-width.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
index 82574a53e6d..047f58e103f 100644
--- a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
+++ b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini
@@ -2,3 +2,36 @@
   [Computed style]
     expected: FAIL
 
+  [source width and height attributes are used to infer aspect-ratio in <picture>]
+    expected: FAIL
+
+  [Computed style for width/height/aspect-ratio]
+    expected: FAIL
+
+  [Source width/height should take precedence over img attributes.]
+    expected: FAIL
+
+  [Make sure style gets invalidated correctly when the source gets removed.]
+    expected: FAIL
+
+  [If the <source> has only one of width/height, we don't get an aspect ratio, even if the <img> has both.]
+    expected: FAIL
+
+  [If we don't have width/height on the source, we fall back to width/height on the <img>.]
+    expected: FAIL
+
+  [If we only have one width/height attribute, we should get that attribute mapped but no aspect ratio, even if <img> has attributes.]
+    expected: FAIL
+
+  [Dynamically changing width/height should change computed style]
+    expected: FAIL
+
+  [Changing which <source> matches should change computed style]
+    expected: FAIL
+
+  [Percentages on source should be ignored for aspect-ratio but used for width/height.]
+    expected: FAIL
+
+  [Trailing garbage should be ignored but not make the attribute invalid]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..963d4cd20ef 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 7a36937927c..7d2b5231af2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index b3643f7f51e..1f889a84dea 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -2,57 +2,75 @@
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
+  [textarea: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index a057142bbc5..510ea619a7d 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,5 +1,6 @@
 [htmlanchorelement_noopener.html]
   type: testharness
+  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -7,11 +8,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html.ini
new file mode 100644
index 00000000000..be4871794dc
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html.ini
@@ -0,0 +1,2 @@
+[dynamic-import-with-assertion-argument.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index a9677391662..00000000000
--- a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index b7e13cf7726..f1281b5ae81 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,4 +1,5 @@
 [audiocontext-not-fully-active.html]
+  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webdriver/tests/bidi/new_session/connect.py.ini b/tests/wpt/metadata/webdriver/tests/bidi/new_session/connect.py.ini
index 9bc73194a05..dc5fb114d54 100644
--- a/tests/wpt/metadata/webdriver/tests/bidi/new_session/connect.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/bidi/new_session/connect.py.ini
@@ -11,3 +11,9 @@
   [test_bidi_session_3[capabilities0-True\]]
     expected: ERROR
 
+  [test_bidi_session_send]
+    expected: ERROR
+
+  [test_bidi_session_with_different_capability[capabilities0\]]
+    expected: ERROR
+
diff --git a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
index b4d4b898636..9d262275083 100644
--- a/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/execute_script/cyclic.py.ini
@@ -2,9 +2,3 @@
   [test_element_in_object]
     expected: FAIL
 
-  [test_array_in_object]
-    expected: FAIL
-
-  [test_object_in_array]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bfd4d6dd2d6..bf2a1d61bab 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,5 +1,4 @@
 [import-in-moduleworker.html]
-  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 333edb3a26e..650c91da4a6 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,4 +1,5 @@
 [sharedworker-in-worker.html]
+  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py b/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
index 7710a824b2d..01103a232b6 100755
--- a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
@@ -76,6 +76,43 @@ def get_test_filename(spec_directory, spec_json, selection):
         spec_json['test_file_path_pattern'] % selection_for_filename)
 
 
+def get_csp_value(value):
+    '''
+    Returns actual CSP header values (e.g. "worker-src 'self'") for the
+    given string used in PolicyDelivery's value (e.g. "worker-src-self").
+    '''
+
+    # script-src
+    # Test-related scripts like testharness.js and inline scripts containing
+    # test bodies.
+    # 'unsafe-inline' is added as a workaround here. This is probably not so
+    # bad, as it shouldn't intefere non-inline-script requests that we want to
+    # test.
+    if value == 'script-src-wildcard':
+        return "script-src * 'unsafe-inline'"
+    if value == 'script-src-self':
+        return "script-src 'self' 'unsafe-inline'"
+    # Workaround for "script-src 'none'" would be more complicated, because
+    # - "script-src 'none' 'unsafe-inline'" is handled somehow differently from
+    #   "script-src 'none'", i.e.
+    #   https://w3c.github.io/webappsec-csp/#match-url-to-source-list Step 3
+    #   handles the latter but not the former.
+    # - We need nonce- or path-based additional values to allow same-origin
+    #   test scripts like testharness.js.
+    # Therefore, we disable 'script-src-none' tests for now in
+    # `/content-security-policy/spec.src.json`.
+    if value == 'script-src-none':
+        return "script-src 'none'"
+
+    # worker-src
+    if value == 'worker-src-wildcard':
+        return 'worker-src *'
+    if value == 'worker-src-self':
+        return "worker-src 'self'"
+    if value == 'worker-src-none':
+        return "worker-src 'none'"
+    raise Exception('Invalid delivery_value: %s' % value)
+
 def handle_deliveries(policy_deliveries):
     '''
     Generate <meta> elements and HTTP headers for the given list of
@@ -110,6 +147,16 @@ def handle_deliveries(policy_deliveries):
             else:
                 raise Exception(
                     'Invalid delivery_type: %s' % delivery.delivery_type)
+        elif delivery.key == 'contentSecurityPolicy':
+            csp_value = get_csp_value(delivery.value)
+            if delivery.delivery_type == 'meta':
+                meta += '<meta http-equiv="Content-Security-Policy" ' + \
+                       'content="' + csp_value + '">'
+            elif delivery.delivery_type == 'http-rp':
+                headers['Content-Security-Policy'] = csp_value
+            else:
+                raise Exception(
+                    'Invalid delivery_type: %s' % delivery.delivery_type)
         elif delivery.key == 'upgradeInsecureRequests':
             # https://w3c.github.io/webappsec-upgrade-insecure-requests/#delivery
             assert (delivery.value == 'upgrade')
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/spec.src.json b/tests/wpt/web-platform-tests/common/security-features/tools/spec.src.json
index 5c8f97ad2ee..0a46a1cd6d3 100644
--- a/tests/wpt/web-platform-tests/common/security-features/tools/spec.src.json
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/spec.src.json
@@ -94,16 +94,23 @@
       "delivery_value": "*",
       "redirection": "*",
       "subresource": [
-        "area-tag",
         "a-tag",
+        "area-tag",
+        "audio-tag",
+        "beacon",
         "fetch",
         "iframe-tag",
         "img-tag",
+        "link-css-tag",
+        "link-prefetch-tag",
+        "object-tag",
+        "picture-tag",
         "script-tag",
         "sharedworker-classic",
         "sharedworker-import",
         "sharedworker-import-data",
         "sharedworker-module",
+        "video-tag",
         "worker-classic",
         "worker-import",
         "worker-import-data",
@@ -127,6 +134,27 @@
         "cross-ws-downgrade"
       ],
       "expectation": "*"
+    },
+    {
+      // Worklets are HTTPS contexts only
+      "expansion": "*",
+      "source_scheme": "http",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "subresource": [
+        "worklet-animation",
+        "worklet-animation-import-data",
+        "worklet-audio",
+        "worklet-audio-import-data",
+        "worklet-layout",
+        "worklet-layout-import-data",
+        "worklet-paint",
+        "worklet-paint-import-data"
+      ],
+      "origin": "*",
+      "expectation": "*"
     }
   ],
   "source_context_schema": {
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/util.py b/tests/wpt/web-platform-tests/common/security-features/tools/util.py
index 0274f8af0b5..1233ffbc0ec 100644
--- a/tests/wpt/web-platform-tests/common/security-features/tools/util.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/util.py
@@ -122,6 +122,8 @@ class PolicyDelivery(object):
                 raise ShouldSkip()
             policy_delivery = target_policy_delivery
         elif obj == "anotherPolicy":
+            if len(supported_delivery_types) == 0:
+                raise ShouldSkip()
             policy_delivery = target_policy_delivery.get_another_policy(
                 supported_delivery_types[0])
         elif isinstance(obj, dict):
@@ -156,6 +158,11 @@ class PolicyDelivery(object):
                 return PolicyDelivery(delivery_type, self.key, None)
             else:
                 return PolicyDelivery(delivery_type, self.key, 'opt-in')
+        elif self.key == 'contentSecurityPolicy':
+            if self.value is not None:
+                return PolicyDelivery(delivery_type, self.key, None)
+            else:
+                return PolicyDelivery(delivery_type, self.key, 'worker-src-none')
         elif self.key == 'upgradeInsecureRequests':
             if self.value == 'upgrade':
                 return PolicyDelivery(delivery_type, self.key, None)
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html
new file mode 100644
index 00000000000..a5505da3ecc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html
new file mode 100644
index 00000000000..1001b8934cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/script-tag.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html
new file mode 100644
index 00000000000..9539763e524
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html
new file mode 100644
index 00000000000..e8f4411aa27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..dca4996e6b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..e082a0aabdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html
new file mode 100644
index 00000000000..79880d3822f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html
new file mode 100644
index 00000000000..b561c096e0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html
new file mode 100644
index 00000000000..a8fd6b61f44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html
new file mode 100644
index 00000000000..a9ccaf5f8dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/sharedworker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html
new file mode 100644
index 00000000000..755e1cfcc89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html
new file mode 100644
index 00000000000..f745886d17f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html
new file mode 100644
index 00000000000..128bca9dc5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html
new file mode 100644
index 00000000000..a819b2f680e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html
new file mode 100644
index 00000000000..c15a45c6cfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html
new file mode 100644
index 00000000000..fb93bdec2ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html
new file mode 100644
index 00000000000..ae0d9198339
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html
new file mode 100644
index 00000000000..f630ea0ff13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..c743fc65619
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html
new file mode 100644
index 00000000000..b25544c193a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-animation.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..46ed3a0bf15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html
new file mode 100644
index 00000000000..57d8809f754
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-audio.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..1503c93758b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html
new file mode 100644
index 00000000000..c3fae6d44f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-layout.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..122cedef881
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html
new file mode 100644
index 00000000000..843b00e6758
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers
new file mode 100644
index 00000000000..32b65539e69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-self/worklet-paint.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src 'self' 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html
new file mode 100644
index 00000000000..4a8673d320b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html
new file mode 100644
index 00000000000..99d3fa4dbc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/script-tag.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html
new file mode 100644
index 00000000000..9539763e524
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html
new file mode 100644
index 00000000000..e8f4411aa27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..dca4996e6b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..e082a0aabdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html
new file mode 100644
index 00000000000..235eb3b5ea2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html
new file mode 100644
index 00000000000..c0e60c11978
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html
new file mode 100644
index 00000000000..a8fd6b61f44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html
new file mode 100644
index 00000000000..a9ccaf5f8dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/sharedworker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html
new file mode 100644
index 00000000000..755e1cfcc89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html
new file mode 100644
index 00000000000..f745886d17f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html
new file mode 100644
index 00000000000..128bca9dc5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html
new file mode 100644
index 00000000000..a819b2f680e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html
new file mode 100644
index 00000000000..8e729f63bdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html
new file mode 100644
index 00000000000..ecb08bfb33f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html
new file mode 100644
index 00000000000..ae0d9198339
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html
new file mode 100644
index 00000000000..f630ea0ff13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..c743fc65619
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html
new file mode 100644
index 00000000000..35f658cb067
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-animation.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..46ed3a0bf15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html
new file mode 100644
index 00000000000..e2b02e941fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-audio.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..1503c93758b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html
new file mode 100644
index 00000000000..e8c85645610
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-layout.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..122cedef881
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html
new file mode 100644
index 00000000000..e06edb7be29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers
new file mode 100644
index 00000000000..cbc7a1b54f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/script-src-wildcard/worklet-paint.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: script-src * 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html
new file mode 100644
index 00000000000..4a8673d320b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html
new file mode 100644
index 00000000000..99d3fa4dbc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/script-tag.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html
new file mode 100644
index 00000000000..2cf32d1d115
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html
new file mode 100644
index 00000000000..377eeaccc72
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..dca4996e6b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..e082a0aabdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html
new file mode 100644
index 00000000000..53d060edeb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html
new file mode 100644
index 00000000000..3537249e429
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html
new file mode 100644
index 00000000000..8cfd3c6332b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html
new file mode 100644
index 00000000000..5982ad05210
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/sharedworker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html
new file mode 100644
index 00000000000..403963d5618
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html
new file mode 100644
index 00000000000..ceb78f54f2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html
new file mode 100644
index 00000000000..128bca9dc5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html
new file mode 100644
index 00000000000..a819b2f680e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html
new file mode 100644
index 00000000000..0a5e46bcace
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html
new file mode 100644
index 00000000000..777ec91f994
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html
new file mode 100644
index 00000000000..8e418f50b7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html
new file mode 100644
index 00000000000..7ebb8250cd4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..e76d985825a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html
new file mode 100644
index 00000000000..35f658cb067
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-animation.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..88f6fa6ff8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html
new file mode 100644
index 00000000000..e2b02e941fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-audio.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..84d673d7065
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html
new file mode 100644
index 00000000000..e8c85645610
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-layout.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..5c4c1c57b9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html
new file mode 100644
index 00000000000..e06edb7be29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers
new file mode 100644
index 00000000000..c75aa51ab41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-none/worklet-paint.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'none'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html
new file mode 100644
index 00000000000..4a8673d320b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html
new file mode 100644
index 00000000000..99d3fa4dbc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/script-tag.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html
new file mode 100644
index 00000000000..9539763e524
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html
new file mode 100644
index 00000000000..e8f4411aa27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..dca4996e6b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..e082a0aabdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html
new file mode 100644
index 00000000000..79880d3822f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html
new file mode 100644
index 00000000000..b561c096e0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html
new file mode 100644
index 00000000000..a8fd6b61f44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html
new file mode 100644
index 00000000000..a9ccaf5f8dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/sharedworker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html
new file mode 100644
index 00000000000..755e1cfcc89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html
new file mode 100644
index 00000000000..f745886d17f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html
new file mode 100644
index 00000000000..128bca9dc5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html
new file mode 100644
index 00000000000..a819b2f680e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html
new file mode 100644
index 00000000000..c15a45c6cfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html
new file mode 100644
index 00000000000..fb93bdec2ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html
new file mode 100644
index 00000000000..ae0d9198339
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html
new file mode 100644
index 00000000000..f630ea0ff13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..e76d985825a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html
new file mode 100644
index 00000000000..35f658cb067
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-animation.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..88f6fa6ff8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html
new file mode 100644
index 00000000000..e2b02e941fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-audio.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..84d673d7065
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html
new file mode 100644
index 00000000000..e8c85645610
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-layout.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..5c4c1c57b9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html
new file mode 100644
index 00000000000..e06edb7be29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers
new file mode 100644
index 00000000000..d55f863f727
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-self/worklet-paint.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src 'self'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html
new file mode 100644
index 00000000000..4a8673d320b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html
new file mode 100644
index 00000000000..99d3fa4dbc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/script-tag.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html
new file mode 100644
index 00000000000..9539763e524
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html
new file mode 100644
index 00000000000..e8f4411aa27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..dca4996e6b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..e082a0aabdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html
new file mode 100644
index 00000000000..235eb3b5ea2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html
new file mode 100644
index 00000000000..c0e60c11978
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html
new file mode 100644
index 00000000000..a8fd6b61f44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html
new file mode 100644
index 00000000000..a9ccaf5f8dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/sharedworker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html
new file mode 100644
index 00000000000..755e1cfcc89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html
new file mode 100644
index 00000000000..f745886d17f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-classic.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html
new file mode 100644
index 00000000000..128bca9dc5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html
new file mode 100644
index 00000000000..a819b2f680e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html
new file mode 100644
index 00000000000..8e729f63bdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html
new file mode 100644
index 00000000000..ecb08bfb33f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-import.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html
new file mode 100644
index 00000000000..ae0d9198339
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.http.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html
new file mode 100644
index 00000000000..f630ea0ff13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worker-module.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..e76d985825a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html
new file mode 100644
index 00000000000..35f658cb067
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-animation.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..88f6fa6ff8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html
new file mode 100644
index 00000000000..e2b02e941fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-audio.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..84d673d7065
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html
new file mode 100644
index 00000000000..e8c85645610
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-layout.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..5c4c1c57b9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint-import-data.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html
new file mode 100644
index 00000000000..e06edb7be29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers
new file mode 100644
index 00000000000..59e5c0fc4a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.http-rp/worker-src-wildcard/worklet-paint.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: worker-src *
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html
new file mode 100644
index 00000000000..2490b51d294
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html
new file mode 100644
index 00000000000..ce2d9dcc406
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/script-tag.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html
new file mode 100644
index 00000000000..3d8a6c917d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html
new file mode 100644
index 00000000000..017f25415f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..8b65298fe29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..07ee2c84742
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html
new file mode 100644
index 00000000000..1f64e8ab9d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html
new file mode 100644
index 00000000000..d91caff0005
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html
new file mode 100644
index 00000000000..1645db76b49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html
new file mode 100644
index 00000000000..1be825f89e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/sharedworker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html
new file mode 100644
index 00000000000..9c0a4f09b4e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html
new file mode 100644
index 00000000000..1c05c681138
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html
new file mode 100644
index 00000000000..9d779e5c325
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html
new file mode 100644
index 00000000000..811604d52c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html
new file mode 100644
index 00000000000..5d4e86c55d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html
new file mode 100644
index 00000000000..4813ae58bbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html
new file mode 100644
index 00000000000..0fe08ca09c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html
new file mode 100644
index 00000000000..c116226abe2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..d8eb6d72cb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html
new file mode 100644
index 00000000000..755ec46954e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-animation.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..bd31e5a853b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html
new file mode 100644
index 00000000000..63dbc4fcbc9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-audio.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..2dd7414c441
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html
new file mode 100644
index 00000000000..6e8ab9f3246
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-layout.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..ed95e243c4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html
new file mode 100644
index 00000000000..6619a3c6a8d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-self/worklet-paint.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html
new file mode 100644
index 00000000000..298019cfaee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html
new file mode 100644
index 00000000000..bcd9e411647
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/script-tag.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html
new file mode 100644
index 00000000000..8af7a3b337e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html
new file mode 100644
index 00000000000..1b528007828
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..b9663e29935
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..7f97a53c5b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html
new file mode 100644
index 00000000000..f91d5426717
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html
new file mode 100644
index 00000000000..0ed064fa95d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html
new file mode 100644
index 00000000000..b3c7e128023
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html
new file mode 100644
index 00000000000..f2731a389ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/sharedworker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html
new file mode 100644
index 00000000000..17ed6fc9c6a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html
new file mode 100644
index 00000000000..9a397d129ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html
new file mode 100644
index 00000000000..4d4134b88f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html
new file mode 100644
index 00000000000..34f4bc67fd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html
new file mode 100644
index 00000000000..ce1b63e2809
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html
new file mode 100644
index 00000000000..9f2b25ea2b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html
new file mode 100644
index 00000000000..f939428700d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html
new file mode 100644
index 00000000000..df6fa84aab0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..abd386200f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html
new file mode 100644
index 00000000000..258bebb569c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-animation.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..4fbd224b573
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html
new file mode 100644
index 00000000000..91920cfde78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-audio.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..fcaaba6d1d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html
new file mode 100644
index 00000000000..25aa1900fc2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-layout.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..8eb2ccf20c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html
new file mode 100644
index 00000000000..4c1c9d9442c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/script-src-wildcard/worklet-paint.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="script-src * 'unsafe-inline'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html
new file mode 100644
index 00000000000..808f87b8afd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html
new file mode 100644
index 00000000000..3984c0aca09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/script-tag.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html
new file mode 100644
index 00000000000..c9a52b9e8a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html
new file mode 100644
index 00000000000..9c5d99d6534
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..67aa293d601
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..962656cf858
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html
new file mode 100644
index 00000000000..d7d3fde214d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html
new file mode 100644
index 00000000000..a71218033ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html
new file mode 100644
index 00000000000..eab95789566
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html
new file mode 100644
index 00000000000..54ee491d2ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/sharedworker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html
new file mode 100644
index 00000000000..fb2a513be6f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html
new file mode 100644
index 00000000000..b858ab6fd3d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html
new file mode 100644
index 00000000000..c51f5fdfc9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html
new file mode 100644
index 00000000000..ba72382263a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html
new file mode 100644
index 00000000000..ecc354b42c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html
new file mode 100644
index 00000000000..d46f8002c76
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html
new file mode 100644
index 00000000000..dbb3736d8c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html
new file mode 100644
index 00000000000..ecb46e6c5a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..cd1323b7b98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html
new file mode 100644
index 00000000000..56a7b38990f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-animation.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..4b6d27f353d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html
new file mode 100644
index 00000000000..230b24b0cb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-audio.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..256d27bd5a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html
new file mode 100644
index 00000000000..f91d5994b48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-layout.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..0a4ce7eea93
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html
new file mode 100644
index 00000000000..70d2bc43d51
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-none/worklet-paint.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'none'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html
new file mode 100644
index 00000000000..01473eca104
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html
new file mode 100644
index 00000000000..9e2b8e4fcc0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/script-tag.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html
new file mode 100644
index 00000000000..da84d477fe6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html
new file mode 100644
index 00000000000..c8a0fe09623
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..53c2883a53d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..88c76a0e943
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html
new file mode 100644
index 00000000000..d758a8ea94e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html
new file mode 100644
index 00000000000..856627977e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html
new file mode 100644
index 00000000000..4f8ac90112f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html
new file mode 100644
index 00000000000..21540178d48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/sharedworker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html
new file mode 100644
index 00000000000..3bbe1c567e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html
new file mode 100644
index 00000000000..f6324c395b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html
new file mode 100644
index 00000000000..3fd637403fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html
new file mode 100644
index 00000000000..44847d37307
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html
new file mode 100644
index 00000000000..739c7dc36c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html
new file mode 100644
index 00000000000..0b39eecc3b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html
new file mode 100644
index 00000000000..bca26ecf791
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html
new file mode 100644
index 00000000000..830632fffe1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..ccc4ff906c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html
new file mode 100644
index 00000000000..26d075f78fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-animation.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..1cd0b7cb78e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html
new file mode 100644
index 00000000000..02fc8f4aa7a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-audio.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..e76314d8656
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html
new file mode 100644
index 00000000000..47c069f3491
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-layout.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..3667b8f7110
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html
new file mode 100644
index 00000000000..f8acb0ce054
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-self/worklet-paint.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src 'self'">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html
new file mode 100644
index 00000000000..bfde09236b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html
new file mode 100644
index 00000000000..4374b3ee748
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/script-tag.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for script-tag to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html
new file mode 100644
index 00000000000..b8f7ada43e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html
new file mode 100644
index 00000000000..5cba138c777
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html
new file mode 100644
index 00000000000..946e251e9a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html
new file mode 100644
index 00000000000..172ef2c9820
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for sharedworker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html
new file mode 100644
index 00000000000..e0128ae1e9e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html
new file mode 100644
index 00000000000..9ecc4b4edeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html
new file mode 100644
index 00000000000..60825b9f16a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html
new file mode 100644
index 00000000000..4ce3dc37caa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/sharedworker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html
new file mode 100644
index 00000000000..b0cb7ddfaf5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html
new file mode 100644
index 00000000000..ae6eef0c91c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-classic.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html
new file mode 100644
index 00000000000..0cc445bc9f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html
new file mode 100644
index 00000000000..a84d5bedc8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects blocked for worker-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html
new file mode 100644
index 00000000000..2a7ceb247b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.http.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-http origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html
new file mode 100644
index 00000000000..ce4a52582dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-import.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-import",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-import to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html
new file mode 100644
index 00000000000..fd0c39f3505
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.http.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html
new file mode 100644
index 00000000000..8eaab9e278c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worker-module.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html
new file mode 100644
index 00000000000..3569ae6faab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html
new file mode 100644
index 00000000000..0fa6c1f84ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-animation.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-animation",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-animation to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html
new file mode 100644
index 00000000000..dcb89228762
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html
new file mode 100644
index 00000000000..16a020813e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-audio.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-audio",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-audio to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html
new file mode 100644
index 00000000000..2ef11440f2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html
new file mode 100644
index 00000000000..6f85b4f0bb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-layout.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-layout to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html
new file mode 100644
index 00000000000..e1ffaaccfdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint-import-data.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint-import-data to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html
new file mode 100644
index 00000000000..27c2573a69d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/gen/top.meta/worker-src-wildcard/worklet-paint.https.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec content-security-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="worker-src *">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to cross-https origin and swap-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and keep-origin redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint",
+            "subresource_policy_deliveries": [],
+            "test_description": "Content Security Policy: Expects allowed for worklet-paint to same-https origin and swap-origin redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/test-case.sub.js b/tests/wpt/web-platform-tests/content-security-policy/generic/test-case.sub.js
new file mode 100644
index 00000000000..6cb262be0f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/test-case.sub.js
@@ -0,0 +1,94 @@
+function TestCase(scenarios, sanityChecker) {
+  function runTest(scenario) {
+    sanityChecker.checkScenario(scenario, subresourceMap);
+
+    const urls = getRequestURLs(scenario.subresource,
+                                scenario.origin,
+                                scenario.redirection);
+
+    /** @type {Subresource} */
+    const subresource = {
+      subresourceType: scenario.subresource,
+      url: urls.testUrl,
+      policyDeliveries: scenario.subresource_policy_deliveries,
+    };
+
+    let violationEventResolve;
+    // Resolved with an array of securitypolicyviolation events.
+    const violationEventPromise = new Promise(resolve => {
+        violationEventResolve = resolve;
+      });
+
+    promise_test(async t => {
+      await xhrRequest(urls.announceUrl);
+
+      // Currently only requests from top-level Documents are tested
+      // (specified by `spec.src.json`) and thus securitypolicyviolation
+      // events are assumed to be fired on the top-level Document here.
+      // When adding non-top-level Document tests, securitypolicyviolation
+      // events should be caught in appropriate contexts.
+      const violationEvents = [];
+      const listener = e => { violationEvents.push(e); };
+      document.addEventListener('securitypolicyviolation', listener);
+
+      try {
+        // Send out the real resource request.
+        // This should tear down the key if it's not blocked.
+        const mainPromise = invokeRequest(subresource, scenario.source_context_list);
+        if (scenario.expectation === 'allowed') {
+          await mainPromise;
+        } else {
+          await mainPromise
+              .then(t.unreached_func('main promise resolved unexpectedly'))
+              .catch(_ => {});
+        }
+      } finally {
+        // Always perform post-processing/clean up for
+        // 'securitypolicyviolation' events and resolve
+        // `violationEventPromise`, to prevent timeout of the
+        // promise_test() below.
+
+        // securitypolicyviolation events are fired in a queued task in
+        // https://w3c.github.io/webappsec-csp/#report-violation
+        // so wait for queued tasks to run using setTimeout().
+        await new Promise(resolve => setTimeout(resolve, 0));
+
+        // Workaround for a Chromium bug (https://crbug.com/1179832).
+        await new Promise(resolve => setTimeout(resolve, 0));
+
+        // Pass violation events to `violationEventPromise` (which will be tested
+        // in the subsequent promise_test()) and clean up the listener.
+        violationEventResolve(violationEvents);
+        document.removeEventListener('securitypolicyviolation', listener);
+      }
+
+      // Send request to check if the key has been torn down.
+      const assertResult = await xhrRequest(urls.assertUrl);
+
+      // Now check if the value has been torn down. If it's still there,
+      // we have blocked the request by content security policy.
+      assert_equals(assertResult.status, scenario.expectation,
+        "The resource request should be '" + scenario.expectation + "'.");
+
+    }, scenario.test_description);
+
+    promise_test(async _ => {
+        const violationEvents = await violationEventPromise;
+        if (scenario.expectation === 'allowed') {
+          assert_array_equals(violationEvents, [],
+              'no violation events should be fired');
+        } else {
+          assert_equals(violationEvents.length, 1,
+              'One violation event should be fired');
+        }
+      }, scenario.test_description + ": securitypolicyviolation");
+  }  // runTest
+
+  function runTests() {
+    for (const scenario of scenarios) {
+      runTest(scenario);
+    }
+  }
+
+  return {start: runTests};
+}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/spec.src.json b/tests/wpt/web-platform-tests/content-security-policy/spec.src.json
new file mode 100644
index 00000000000..befedad087b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/spec.src.json
@@ -0,0 +1,566 @@
+{
+  "test_description_template": "Content Security Policy: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.",
+  "test_page_title_template": "Content Security Policy: %(title)s",
+  "specification": [
+    {
+      "title": "content security policy",
+      "description": "content security policy",
+      "specification_url": "https://w3c.github.io/webappsec-csp/",
+      "test_expansion": [
+        // Set "allowed" for all requests here, and set "block" for requests
+        // to be blocked by CSP in subsequent sections.
+        // (Requests blocked due to non-CSP reasons (e.g. cross-origin workers)
+        // are excluded by `excluded_tests` sections)
+        {
+          "expansion": "default",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "*",
+          "redirection": "*",
+          "origin": "*",
+          "subresource": "*",
+          "expectation": "allowed"
+        },
+
+        // script-src
+        {
+          // "script-src" blocks script-ish requests, except for ...
+          "expansion": "override",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": [
+            "script-src-none",
+            "script-src-self",
+            "script-src-wildcard"
+          ],
+          "redirection": "*",
+          "origin": "*",
+          "subresource": [
+            "script-tag",
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-import-data",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-import-data",
+            "worker-module",
+            "worklet-animation",
+            "worklet-animation-import-data",
+            "worklet-audio",
+            "worklet-audio-import-data",
+            "worklet-layout",
+            "worklet-layout-import-data",
+            "worklet-paint",
+            "worklet-paint-import-data"
+          ],
+          "expectation": "blocked"
+        },
+        {
+          // non-data: URLs for "script-src *",
+          "expansion": "override",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "script-src-wildcard",
+          "redirection": "*",
+          "origin": "*",
+          "subresource": [
+            "script-tag",
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-module",
+            "worklet-animation",
+            "worklet-audio",
+            "worklet-layout",
+            "worklet-paint"
+          ],
+          "expectation": "allowed"
+        },
+        {
+          // same-origin requests (HTTP) for "script-src 'self'", or
+          "expansion": "override",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "script-src-self",
+          "redirection": ["no-redirect", "keep-origin"],
+          "origin": "same-http",
+          "subresource": [
+            "script-tag",
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-module",
+            "worklet-animation",
+            "worklet-audio",
+            "worklet-layout",
+            "worklet-paint"
+          ],
+          "expectation": "allowed"
+        },
+        {
+          // same-origin requests (HTTPS) for "script-src 'self'".
+          "expansion": "override",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "script-src-self",
+          "redirection": ["no-redirect", "keep-origin"],
+          "origin": "same-https",
+          "subresource": [
+            "script-tag",
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-module",
+            "worklet-animation",
+            "worklet-audio",
+            "worklet-layout",
+            "worklet-paint"
+          ],
+          "expectation": "allowed"
+        },
+
+        // worker-src
+        {
+          // "worker-src" blocks worker requests, except for ...
+          "expansion": "override",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": [
+            "worker-src-none",
+            "worker-src-self",
+            "worker-src-wildcard"
+          ],
+          "redirection": "*",
+          "origin": "*",
+          "subresource": [
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-import-data",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-import-data",
+            "worker-module"
+          ],
+          "expectation": "blocked"
+        },
+        {
+          // non-data: URLs for "worker-src *",
+          "expansion": "override",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "worker-src-wildcard",
+          "redirection": "*",
+          "origin": "*",
+          "subresource": [
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-module"
+          ],
+          "expectation": "allowed"
+        },
+        {
+          // same-origin requests (HTTP) for "worker-src 'self'", or
+          "expansion": "override",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "worker-src-self",
+          "redirection": ["no-redirect", "keep-origin"],
+          "origin": "same-http",
+          "subresource": [
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-module"
+          ],
+          "expectation": "allowed"
+        },
+        {
+          // same-origin requests (HTTPS) for "worker-src 'self'".
+          "expansion": "override",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": "worker-src-self",
+          "redirection": ["no-redirect", "keep-origin"],
+          "origin": "same-https",
+          "subresource": [
+            "sharedworker-classic",
+            "sharedworker-import",
+            "sharedworker-module",
+            "worker-classic",
+            "worker-import",
+            "worker-module"
+          ],
+          "expectation": "allowed"
+        },
+
+      ]
+    }
+  ],
+  "delivery_key": "contentSecurityPolicy",
+  "excluded_tests": [
+    {
+      // upgraded-protocol-workers
+      "expansion": "*",
+      "source_scheme": "http",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "origin": [
+        "same-https",
+        "cross-https"
+      ],
+      "subresource": [
+        "worker-classic",
+        "worker-module",
+        "sharedworker-classic",
+        "sharedworker-module"
+      ],
+      "expectation": "*"
+    },
+    {
+      // mixed-content-insecure-subresources
+      "expansion": "*",
+      "source_scheme": "https",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "origin": [
+        "same-http",
+        "same-http-downgrade",
+        "cross-http",
+        "cross-http-downgrade",
+        "same-ws",
+        "same-ws-downgrade",
+        "cross-ws",
+        "cross-ws-downgrade"
+      ],
+      "subresource": "*",
+      "expectation": "*"
+    },
+    {
+      // redirections that content security policy tests don't care
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": [
+        "keep-scheme",
+        "swap-scheme",
+        "downgrade"
+      ],
+      "origin": "*",
+      "subresource": "*",
+      "expectation": "*"
+    },
+    {
+      // origins that content security policy tests don't care
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "origin": [
+        "same-http-downgrade",
+        "cross-http-downgrade",
+        "same-ws-downgrade",
+        "cross-ws-downgrade"
+      ],
+      "subresource": "*",
+      "expectation": "*"
+    },
+    {
+      // source_context_list values not for content security policy tests
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": [
+        "worker-classic",
+        "worker-module"
+      ],
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "subresource": "*",
+      "origin": "*",
+      "expectation": "*"
+    },
+    {
+      // source_context_list values to be blocked by CSP (i.e. the source
+      // context itself should be blocked by CSP before sending subresource
+      // requests):
+      // - data: URLs are blocked by "worker-src *", "worker-src 'self'" or
+      //   "worker-src 'none'".
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": [
+        "worker-classic-data",
+        "worker-module-data",
+        "sharedworker-classic-data",
+        "sharedworker-module-data"
+      ],
+      "delivery_type": "*",
+      "delivery_value": [
+        "worker-src-wildcard",
+        "worker-src-self",
+        "worker-src-none"
+      ],
+      "redirection": "*",
+      "subresource": "*",
+      "origin": "*",
+      "expectation": "*"
+    },
+    {
+      // Currently only requests from top-level Documents are tested, because
+      // `generic/test-case.sub.js` assumes that `securitypolicyviolation`
+      // events are fired on top-level Documents. Once
+      // `generic/test-case.sub.js` is fixed, we can enable non-top
+      // source_context_list here.
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": [
+        "srcdoc-inherit",
+        "srcdoc",
+        "iframe",
+        "iframe-blank-inherit",
+        "worker-classic",
+        "worker-classic-inherit",
+        "worker-classic-data",
+        "worker-module",
+        "worker-module-inherit",
+        "worker-module-data",
+        "sharedworker-classic",
+        "sharedworker-classic-data",
+        "sharedworker-module",
+        "sharedworker-module-data"
+      ],
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "subresource": "*",
+      "origin": "*",
+      "expectation": "*"
+    },
+    {
+      // Skip tests with no CSP directives.
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": null,
+      "redirection": "*",
+      "subresource": "*",
+      "origin": "*",
+      "expectation": "*"
+    },
+    {
+      // Skip script-src-none tests, as "script-src 'none'" would prevent
+      // test scripts as well. See also comments in `get_csp_value()` in
+      // `common/security-features/tools/generate.py`.
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "script-src-none",
+      "redirection": "*",
+      "subresource": "*",
+      "origin": "*",
+      "expectation": "*"
+    },
+    // Only test relevant subresources.
+    // E.g. do not test <a> tag for worker-src directives.
+    {
+      // script-src: workers (block), worklets (block), scripts (block)
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": [
+        "script-src-wildcard",
+        "script-src-self",
+        "script-src-none"
+      ],
+      "redirection": "*",
+      "subresource": [
+        "a-tag",
+        "area-tag",
+        "audio-tag",
+        "beacon",
+        "fetch",
+        "iframe-tag",
+        "img-tag",
+        "link-css-tag",
+        "link-prefetch-tag",
+        "object-tag",
+        "picture-tag",
+        "video-tag",
+        "websocket",
+        "xhr"
+      ],
+      "origin": "*",
+      "expectation": "*"
+    },
+    {
+      // worker-src: workers (block), worklets (allow), scripts (allow)
+      "expansion": "*",
+      "source_scheme": "*",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": [
+        "worker-src-wildcard",
+        "worker-src-self",
+        "worker-src-none"
+      ],
+      "redirection": "*",
+      "subresource": [
+        "a-tag",
+        "area-tag",
+        "audio-tag",
+        "beacon",
+        "fetch",
+        "iframe-tag",
+        "img-tag",
+        "link-css-tag",
+        "link-prefetch-tag",
+        "object-tag",
+        "picture-tag",
+        "video-tag",
+        "websocket",
+        "xhr"
+      ],
+      "origin": "*",
+      "expectation": "*"
+    },
+    {
+      // HTTP->HTTPS requests are skipped to reduce the number of tests.
+      "expansion": "*",
+      "source_scheme": "http",
+      "source_context_list": "*",
+      "delivery_type": "*",
+      "delivery_value": "*",
+      "redirection": "*",
+      "origin": [
+        "same-https",
+        "cross-https"
+      ],
+      "subresource": "*",
+      "expectation": "*"
+    },
+  ],
+  "source_context_schema": {
+    "supported_delivery_type": {
+      "top": [
+        "meta",
+        "http-rp"
+      ],
+      // The following lines are commented out, because the
+      // contentSecurityPolicy deliveries are not yet implemented in the
+      // `common/security-features/scope/` scripts.
+      "iframe": [
+        // "meta",
+        // "http-rp"
+      ],
+      "iframe-blank": [
+        // "meta"
+      ],
+      "srcdoc": [
+        // "meta"
+      ],
+      "worker-classic": [
+        // "http-rp"
+      ],
+      "worker-module": [
+        // "http-rp"
+      ],
+      "worker-classic-data": [],
+      "worker-module-data": [],
+      "sharedworker-classic": [
+        // "http-rp"
+      ],
+      "sharedworker-module": [
+        // "http-rp"
+      ],
+      "sharedworker-classic-data": [],
+      "sharedworker-module-data": []
+    }
+  },
+  "subresource_schema": {
+    "supported_delivery_type": {
+      // No per-request CSP can be specified.
+      "a-tag": [],
+      "area-tag": [],
+      "audio-tag": [],
+      "beacon": [],
+      "fetch": [],
+      "iframe-tag": [],
+      "img-tag": [],
+      "link-css-tag": [],
+      "link-prefetch-tag": [],
+      "object-tag": [],
+      "picture-tag": [],
+      "script-tag": [],
+      "sharedworker-classic": [],
+      "sharedworker-import": [],
+      "sharedworker-import-data": [],
+      "sharedworker-module": [],
+      "video-tag": [],
+      "websocket": [],
+      "worker-classic": [],
+      "worker-import": [],
+      "worker-import-data": [],
+      "worker-module": [],
+      "worklet-animation": [],
+      "worklet-animation-import-data": [],
+      "worklet-audio": [],
+      "worklet-audio-import-data": [],
+      "worklet-layout": [],
+      "worklet-layout-import-data": [],
+      "worklet-paint": [],
+      "worklet-paint-import-data": [],
+      "xhr": []
+    }
+  },
+  "test_expansion_schema": {
+    "delivery_type": [
+      "http-rp",
+      "meta"
+    ],
+    "delivery_value": [
+      null,
+      "script-src-none",
+      "script-src-self",
+      "script-src-wildcard",
+      "worker-src-none",
+      "worker-src-self",
+      "worker-src-wildcard"
+    ],
+    "expectation": [
+      "blocked",
+      "allowed"
+    ]
+  }
+}
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/README.md b/tests/wpt/web-platform-tests/cors-rfc1918/README.md
index f641b61971e..266c1435f07 100644
--- a/tests/wpt/web-platform-tests/cors-rfc1918/README.md
+++ b/tests/wpt/web-platform-tests/cors-rfc1918/README.md
@@ -1,8 +1 @@
-# CORS-RFC1918 tests
-
-This directory contains tests for CORS-RFC1918. See also:
-
-* [The specification](https://wicg.github.io/cors-rfc1918/)
-* [The repository](https://github.com/WICG/cors-rfc1918/)
-* [Open issues](https://github.com/WICG/cors-rfc1918/issues/)
-* Additional tests: ../fetch/cors-rfc1918/
+This directory is being deleted. See ../fetch/cors-rfc1918/ instead.
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/address-space.https.window.js b/tests/wpt/web-platform-tests/cors-rfc1918/address-space.https.window.js
deleted file mode 100644
index 3156e3a33d3..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/address-space.https.window.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// META: script=resources/support.js
-//
-// Spec: https://wicg.github.io/cors-rfc1918/#integration-html
-//
-// This file covers only those tests that must execute in a secure context.
-// Other tests are defined in: address-space.window.js
-'use strict';
-
-setup(() => {
-  // No sense running tests if `document.addressSpace` is not implemented.
-  assert_implements(document.addressSpace);
-
-  // The tests below assume that the root document is loaded from the `local`
-  // address space. This might fail depending on how the tests are run/served.
-  // See https://github.com/web-platform-tests/wpt/issues/26166.
-  assert_implements_optional(document.addressSpace == "local");
-});
-
-promise_test(t => {
-  return append_child_frame(t, document, "resources/treat-as-public-address.https.html")
-      .then(child => {
-        return append_child_frame(t, child.contentDocument, "/common/blank.html");
-      })
-      .then(grandchild => {
-        assert_equals(grandchild.contentDocument.addressSpace, "local");
-      });
-}, "Public-local grandchild iframe's addressSpace is local");
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/address-space.window.js b/tests/wpt/web-platform-tests/cors-rfc1918/address-space.window.js
deleted file mode 100644
index 287ab956ab8..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/address-space.window.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// META: script=resources/support.js
-//
-// Spec: https://wicg.github.io/cors-rfc1918/#integration-html
-//
-// See also: address-space.https.window.js
-'use strict';
-
-const kMinimalDoc = [
-    "<!doctype html>",
-    "<meta charset=utf-8>",
-    "<title>Loaded</title>",
-].join("");
-
-setup(() => {
-  // No sense running tests if `document.addressSpace` is not implemented.
-  assert_implements(document.addressSpace);
-
-  // The tests below assume that the root document is loaded from the `local`
-  // address space. This might fail depending on how the tests are run/served.
-  // See https://github.com/web-platform-tests/wpt/issues/26166.
-  assert_implements_optional(document.addressSpace == "local");
-});
-
-promise_test(t => {
-  return append_child_frame_with(t, document, () => {
-        // Do nothing with the child frame's `src` attribute.
-      })
-      .then(child => {
-        assert_equals(child.contentDocument.addressSpace, "local");
-      });
-}, "About:blank iframe's addressSpace is inherited from the root.");
-
-promise_test(t => {
-  return append_child_frame_with(t, document, child => {
-        child.srcdoc = kMinimalDoc;
-      })
-      .then(child => {
-        assert_equals(child.contentDocument.title, "Loaded");
-        assert_equals(child.contentDocument.addressSpace, "local");
-      });
-}, "About:srcdoc iframe's addressSpace is inherited from the root.");
-
-promise_test(t => {
-  // Register an event listener that will resolve this promise when this window
-  // receives a message posted to it.
-  const event_received = new Promise(resolve => {
-    window.addEventListener("message", resolve);
-  });
-
-  const script = "window.parent.postMessage(document.addressSpace, '*');";
-  const url = "data:text/html,<script>" + script + "</script>";
-  return append_child_frame(t, document, url)
-      // Wait for the iframe to be loaded, then wait for an event.
-      .then(() => event_received)
-      .then(evt => {
-        assert_equals(evt.data, "local");
-      });
-}, "Data: iframe's addressSpace is inherited from the root.");
-
-promise_test(t => {
-  const blob = new Blob([kMinimalDoc], {type: "text/html"});
-  return append_child_frame(t, document, URL.createObjectURL(blob))
-      .then(child => {
-        assert_equals(child.contentDocument.title, "Loaded");
-        assert_equals(child.contentDocument.addressSpace, "local");
-      });
-}, "Blob: iframe's addressSpace is inherited from the root.");
-
-promise_test(t => {
-  return append_child_frame(t, document, "resources/title.html")
-      .then(child => {
-        assert_equals(child.contentDocument.title, "Loaded");
-        assert_equals(child.contentDocument.addressSpace, "local");
-      });
-}, "Local iframe's addressSpace is local.");
-
-promise_test(t => {
-  return append_child_frame(t, document, "resources/treat-as-public-address.html")
-      .then(child => {
-        assert_equals(child.contentDocument.title, "Loaded");
-        assert_equals(child.contentDocument.addressSpace, "public");
-      });
-}, "Treat-as-public-address iframe's addressSpace is public.");
-
-promise_test(t => {
-  return append_child_frame(t, document, "resources/title.html")
-      .then(child => {
-        const doc = child.contentDocument;
-        assert_equals(doc.title, "Loaded", "child");
-        assert_equals(doc.addressSpace, "local", "child");
-        return append_child_frame(t, doc, "resources/treat-as-public-address.html");
-      })
-      .then(grandchild => {
-        const doc = grandchild.contentDocument;
-        assert_equals(doc.title, "Loaded", "grandchild");
-        assert_equals(doc.addressSpace, "local", "grandchild");
-      });
-}, "Local-local grandchild iframe's addressSpace is local.");
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/resources/support.js b/tests/wpt/web-platform-tests/cors-rfc1918/resources/support.js
deleted file mode 100644
index 685d656e9e2..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/resources/support.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-// Creates a new iframe in |doc|, calls |func| on it and appends it as a child
-// of |doc|.
-// Returns a promise that resolves to the iframe once loaded (successfully or
-// not).
-// The iframe is removed from |doc| once test |t| is done running.
-//
-// NOTE: Because iframe elements always invoke the onload event handler, even
-// in case of error, we cannot wire onerror to a promise rejection. The Promise
-// constructor requires users to resolve XOR reject the promise.
-function append_child_frame_with(t, doc, func) {
-  return new Promise(resolve => {
-      const child = doc.createElement("iframe");
-      func(child);
-      child.onload = () => { resolve(child); };
-      doc.body.appendChild(child);
-      t.add_cleanup(() => { doc.body.removeChild(child); });
-    });
-}
-
-// Appends a child iframe to |doc| sourced from |src|.
-//
-// See append_child_frame_with() for more details.
-function append_child_frame(t, doc, src) {
-  return append_child_frame_with(t, doc, child => { child.src = src; });
-}
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/resources/title.html b/tests/wpt/web-platform-tests/cors-rfc1918/resources/title.html
deleted file mode 100644
index a3a324a15fd..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/resources/title.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Loaded</title>
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.html b/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.html
deleted file mode 100644
index a3a324a15fd..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Loaded</title>
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.html.headers b/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.html.headers
deleted file mode 100644
index 76371c6209e..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: treat-as-public-address;
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.https.html b/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.https.html
deleted file mode 100644
index a3a324a15fd..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.https.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Loaded</title>
diff --git a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.https.html.headers b/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.https.html.headers
deleted file mode 100644
index 76371c6209e..00000000000
--- a/tests/wpt/web-platform-tests/cors-rfc1918/resources/treat-as-public-address.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: treat-as-public-address;
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html b/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html
index 3c9afe06fa6..3628ff607cc 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/animation/aspect-ratio-interpolation.html
@@ -101,15 +101,29 @@ test_no_interpolation({
   to: '0 / 1',
 });
 
+// Addition of <ratio>s is not possible.
+// https://drafts.csswg.org/css-values/#combine-ratio
+//
+// And if a value type does not define a specific procedure for addition or is
+// defined as not additive, its addition operation is simply Vresult = Va.
+// (The first value is Va, the second value is Vb, and the result is Vresult.)
+// https://drafts.csswg.org/css-values-4/#not-additive,
+//
+// So in this test case:
+// 1. The 1st keyframe: { aspectRatio: 0.5/1, composite: 'replace', offset: 0 }
+// 2. The 2nd keyframe: { aspectRatio:   1/1, composite: 'add',     offset: 1 }
+// and the underlying value is 2/1. Based on the spec, the composited from_value
+// is 0.5/1 (because we just replace it), and the composited to_value is 2/1
+// (because we use Va as the result value).
 test_composition({
   property: 'aspect-ratio',
-  underlying: '0.5 / 1',
-  replaceFrom: '1 / 1',
-  addTo: '2 / 1',
+  underlying: '2 / 1',
+  replaceFrom: '0.5 / 1',
+  addTo: '1 / 1',
 }, [
-  {at: 0, expect: '1 / 1'},
+  {at: 0, expect: '0.5 / 1'},
   {at: 0.5, expect: '1 / 1'},
-  {at: 1, expect: '1 / 1'}
+  {at: 1, expect: '2 / 1'}
 ]);
 
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html
new file mode 100644
index 00000000000..761f18c3f63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<div style="display: inline-block">
+  <img style="height: 100px; max-width: 100%;" src="/images/green-100x50.png">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010.html
new file mode 100644
index 00000000000..c0a8186f86a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-010.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Percentage size abspos box in a containing block that has padding</title>
+<link rel=help href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel=help href="https://bugzilla.mozilla.org/show_bug.cgi?id=1691374">
+<link rel=author href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel=author href="https://mozilla.org" title="Mozilla">
+<link rel=match href="intrinsic-percent-replaced-010-ref.html">
+<div style="position: relative; padding-top: 100px; height: 0;">
+  <div style="position: absolute; top: 0; left: 0; height: 100%; width: 100%;">
+    <div style="display: inline-block; height: 100%;">
+      <img
+        style="height: 100%; max-width: 100%;"
+        src="/images/green-100x50.png">
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html
new file mode 100644
index 00000000000..29a0fe8013d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011-ref.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<div style="writing-mode: vertical-lr">
+  <div style="display: inline-block">
+    <img style="width: 100px; max-height: 100%;" src="/images/green-100x50.png">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011.html
new file mode 100644
index 00000000000..4c0a11fd9aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-011.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Percentage size abspos box in a containing block that has padding</title>
+<link rel=help href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel=help href="https://bugzilla.mozilla.org/show_bug.cgi?id=1691374">
+<link rel=author href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel=author href="https://mozilla.org" title="Mozilla">
+<link rel=match href="intrinsic-percent-replaced-011-ref.html">
+<style>
+  :root { writing-mode: vertical-lr; }
+</style>
+<div style="position: relative; padding-left: 100px; width: 0;">
+  <div style="position: absolute; top: 0; left: 0; height: 100%; width: 100%;">
+    <div style="display: inline-block; width: 100%;">
+      <img
+        style="width: 100%; max-height: 100%;"
+        src="/images/green-100x50.png">
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html
new file mode 100644
index 00000000000..b3099017699
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<style>
+td {
+  width: 50.6px;
+  height: 50.3px;
+  background: yellow;
+  padding: 0;
+  border: 1px solid blue;
+}
+</style>
+<table style="border-collapse: collapse">
+  <tr>
+    <td></td><td></td><td></td>
+  </tr>
+  <tr>
+    <td></td><td></td><td></td>
+  </tr>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td.html b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td.html
new file mode 100644
index 00000000000..d5c60944972
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/collapsed-border-positioned-tr-td.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org" />
+<link rel="help" href="https://crbug.com/1180773"/>
+<link rel="match" href="collapsed-border-positioned-tr-td-ref.html"/>
+<style>
+td {
+  width: 50.6px;
+  height: 50.3px;
+  background: yellow;
+  padding: 0;
+  border: 1px solid blue;
+}
+</style>
+<table style="border-collapse: collapse">
+  <tr style="position: relative">
+    <td></td><td></td><td></td>
+  </tr>
+  <tr>
+    <td style="position: relative"></td>
+    <td style="position: relative"></td>
+    <td style="position: relative"></td>
+  </tr>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/alt-display-vertical-001-manual.html b/tests/wpt/web-platform-tests/css/css-writing-modes/alt-display-vertical-001-manual.html
new file mode 100644
index 00000000000..2e9de77ccb0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/alt-display-vertical-001-manual.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Writing Modes Test: alternate text should display in the writing mode of associated element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#block-flow">
+
+  <meta content="should" name="flags">
+
+  <style>
+  .vrl
+    {
+      float: right;
+      writing-mode: vertical-rl;
+    }
+
+  .vlr
+    {
+      float: left;
+      writing-mode: vertical-lr;
+    }
+  </style>
+
+  <h3><img class="vrl" src="support/does-not-exist.png" alt="Test passes if this text is rotated 90°"></h3>
+
+  <h3><img class="vlr" src="support/does-not-exist.png" alt="Test passes if this text is rotated 90°"></h3>
+
+  <h3 class="vrl"><img src="support/does-not-exist.png" alt="Test passes if this text is rotated 90°"></h3>
+
+  <h3 class="vlr"><img src="support/does-not-exist.png" alt="Test passes if this text is rotated 90°"></h3>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html b/tests/wpt/web-platform-tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html
new file mode 100644
index 00000000000..0ad209aeb5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/tooltip-display-vertical-001-manual.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Writing Modes Test: tooltip should display in the writing mode of associated element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#block-flow">
+
+  <!--
+
+  Bug 1183691: Tooltips should display in the writing mode of the associated element
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1183691
+
+  Issue 703011: Tooltip should be displayed according to the writing mode of associated element
+  https://bugs.chromium.org/p/chromium/issues/detail?id=703011
+
+  -->
+
+  <meta content="may interact" name="flags">
+
+  <style>
+  h3#vrl
+    {
+      float: right;
+      writing-mode: vertical-rl;
+    }
+
+  h3#vlr
+    {
+      float: left;
+      writing-mode: vertical-lr;
+    }
+  </style>
+
+  <h3 title="Test passes if tooltip is vertical and if tooltip text is rotated 90°" id="vrl">Hover pointing device over this text</h3>
+
+  <h3 title="Test passes if tooltip is vertical and if tooltip text is rotated 90°" id="vlr">Hover pointing device over this text</h3>
diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html b/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
index fe0d2f057c3..304660bdcb4 100644
--- a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
+++ b/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
@@ -9,7 +9,6 @@ query_should_be_css_parseable("(prefers-contrast)");
 query_should_be_css_parseable("(prefers-contrast: no-preference)");
 query_should_be_css_parseable("(prefers-contrast: more)");
 query_should_be_css_parseable("(prefers-contrast: less)");
-query_should_be_css_parseable("(prefers-contrast: forced)");
 
 query_should_not_be_css_parseable("(prefers-contrast: increase)");
 query_should_not_be_css_parseable("(prefers-contrast: none)");
@@ -20,12 +19,12 @@ query_should_not_be_css_parseable("(prefers-increased-contrast)");
 query_should_not_be_css_parseable("(prefers-decreased-contrast)");
 query_should_not_be_css_parseable("(prefers-contrast: high)");
 query_should_not_be_css_parseable("(prefers-contrast: low)");
+query_should_not_be_css_parseable("(prefers-contrast: forced)");
 
 query_should_be_js_parseable("(prefers-contrast)");
 query_should_be_js_parseable("(prefers-contrast: no-preference)");
 query_should_be_js_parseable("(prefers-contrast: more)");
 query_should_be_js_parseable("(prefers-contrast: less)");
-query_should_be_js_parseable("(prefers-contrast: forced)");
 
 query_should_not_be_js_parseable("(prefers-contrast: increase)");
 query_should_not_be_js_parseable("(prefers-contrast: none)");
@@ -36,6 +35,7 @@ query_should_not_be_js_parseable("(prefers-increased-contrast)");
 query_should_not_be_js_parseable("(prefers-decreased-contrast)");
 query_should_not_be_js_parseable("(prefers-contrast: high)");
 query_should_not_be_js_parseable("(prefers-contrast: low)");
+query_should_not_be_js_parseable("(prefers-contrast: forced)");
 
 test(() => {
   // no-preference is the default and all other values evaluate to
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md b/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
index fe3e84836c2..d740992bc47 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/server-features.md
@@ -156,7 +156,7 @@ unless `--enable-quic` is specified to `./wpt run`.
 
 ### Test Features specified as query params
 
-Alternatively to specifying [Test Features](file-names.md#test-features) in
+Alternatively to specifying [Test Features](file-names.html#test-features) in
 the test filename, they can be specified by setting the `wpt_flags` in the
 [test variant](testharness.html#variants). For example, the following variant
 will be loaded over HTTPS:
@@ -165,3 +165,10 @@ will be loaded over HTTPS:
 ```
 
 `https`, `h2` and `www` features are supported by `wpt_flags`.
+
+Multiple features can be specified by having multiple `wpt_flags`. For example,
+the following variant will be loaded over HTTPS and run on the www subdomain.
+
+```html
+<meta name="variant" content="wpt_flags=www&wpt_flags=https">
+```
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/META.yml b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/META.yml
new file mode 100644
index 00000000000..6a7359c01bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/META.yml
@@ -0,0 +1,6 @@
+spec: https://wicg.github.io/cors-rfc1918/
+suggested_reviewers:
+  - letitz
+  - hemeryar
+  - camillelamy
+  - mikewest
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/README.md b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/README.md
new file mode 100644
index 00000000000..5ee9c8a01e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/README.md
@@ -0,0 +1,9 @@
+# CORS-RFC1918 tests
+
+This directory contains tests for CORS-RFC1918's integration with Fetch.
+
+See also:
+
+* [The specification](https://wicg.github.io/cors-rfc1918/)
+* [The repository](https://github.com/WICG/cors-rfc1918/)
+* [Open issues](https://github.com/WICG/cors-rfc1918/issues/)
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.tentative.https.html
new file mode 100644
index 00000000000..85d2be9a23f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.tentative.https.html
@@ -0,0 +1,39 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+<script src="./resources/iframeTest.js"></script>
+
+<script>
+
+const parent_coep_credentialless = newWindow(coep_credentialless);
+iframeTest("COEP:credentialless embeds same-origin COEP:none",
+  parent_coep_credentialless, same_origin, coep_none, EXPECT_BLOCK);
+iframeTest("COEP:credentialless embeds cross-origin COEP:none",
+  parent_coep_credentialless, cross_origin, coep_none, EXPECT_BLOCK);
+iframeTest("COEP:credentialless embeds same-origin COEP:credentialless",
+  parent_coep_credentialless, same_origin, coep_credentialless, EXPECT_LOAD);
+iframeTest("COEP:credentialless embeds cross-origin COEP:credentialless",
+  parent_coep_credentialless, cross_origin, coep_credentialless, EXPECT_BLOCK);
+iframeTest("COEP:credentialless embeds same-origin COEP:require-corp",
+  parent_coep_credentialless, same_origin, coep_require_corp, EXPECT_LOAD);
+iframeTest("COEP:credentialless embeds cross-origin COEP:require-corp",
+  parent_coep_credentialless, cross_origin, coep_require_corp, EXPECT_BLOCK);
+
+// Using CORP:cross-origin might unblock previously blocked iframes.
+iframeTestCORP("COEP:credentialless embeds same-origin COEP:none",
+  parent_coep_credentialless, same_origin, coep_none, EXPECT_BLOCK);
+iframeTestCORP("COEP:credentialless embeds cross-origin COEP:none",
+  parent_coep_credentialless, cross_origin, coep_none, EXPECT_BLOCK);
+iframeTestCORP("COEP:credentialless embeds same-origin COEP:credentialless",
+  parent_coep_credentialless, same_origin, coep_credentialless, EXPECT_LOAD);
+iframeTestCORP("COEP:credentialless embeds cross-origin COEP:credentialless",
+  parent_coep_credentialless, cross_origin, coep_credentialless, EXPECT_LOAD);
+iframeTestCORP("COEP:credentialless embeds same-origin COEP:require-corp",
+  parent_coep_credentialless, same_origin, coep_require_corp, EXPECT_LOAD);
+iframeTestCORP("COEP:credentialless embeds cross-origin COEP:require-corp",
+  parent_coep_credentialless, cross_origin, coep_require_corp, EXPECT_LOAD);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.tentative.https.html
new file mode 100644
index 00000000000..ad28c3a5917
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.tentative.https.html
@@ -0,0 +1,25 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+<script src="./resources/iframeTest.js"></script>
+
+<script>
+
+const parent_coep_none = newWindow(coep_none);
+iframeTest("COEP:none embeds same-origin COEP:none",
+  parent_coep_none, same_origin, coep_none, EXPECT_LOAD);
+iframeTest("COEP:none embeds cross-origin COEP:none",
+  parent_coep_none, cross_origin, coep_none, EXPECT_LOAD);
+iframeTest("COEP:none embeds same-origin COEP:credentialless",
+  parent_coep_none, same_origin, coep_credentialless, EXPECT_LOAD);
+iframeTest("COEP:none embeds cross-origin COEP:credentialless",
+  parent_coep_none, cross_origin, coep_credentialless, EXPECT_LOAD);
+iframeTest("COEP:none embeds same-origin COEP:require-corp",
+  parent_coep_none, same_origin, coep_require_corp, EXPECT_LOAD);
+iframeTest("COEP:none embeds cross-origin COEP:require-corp",
+  parent_coep_none, cross_origin, coep_require_corp, EXPECT_LOAD);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.tentative.https.html
new file mode 100644
index 00000000000..cb86ff239aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.tentative.https.html
@@ -0,0 +1,39 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+<script src="./resources/iframeTest.js"></script>
+
+<script>
+
+const parent_coep_require_corp = newWindow(coep_require_corp);
+iframeTest("COEP:require-corp embeds same-origin COEP:none",
+  parent_coep_require_corp, same_origin, coep_none, EXPECT_BLOCK);
+iframeTest("COEP:require-corp embeds cross-origin COEP:none",
+  parent_coep_require_corp, cross_origin, coep_none, EXPECT_BLOCK);
+iframeTest("COEP:require-corp embeds same-origin COEP:credentialless",
+  parent_coep_require_corp, same_origin, coep_credentialless, EXPECT_BLOCK);
+iframeTest("COEP:require-corp embeds cross-origin COEP:credentialless",
+  parent_coep_require_corp, cross_origin, coep_credentialless, EXPECT_BLOCK);
+iframeTest("COEP:require-corp embeds same-origin COEP:require-corp",
+  parent_coep_require_corp, same_origin, coep_require_corp, EXPECT_LOAD);
+iframeTest("COEP:require-corp embeds cross-origin COEP:require-corp",
+  parent_coep_require_corp, cross_origin, coep_require_corp, EXPECT_BLOCK);
+
+// Using CORP:cross-origin might unblock previously blocked iframes.
+iframeTestCORP("COEP:require-corp embeds same-origin COEP:none",
+  parent_coep_require_corp, same_origin, coep_none, EXPECT_BLOCK);
+iframeTestCORP("COEP:require-corp embeds cross-origin COEP:none",
+  parent_coep_require_corp, cross_origin, coep_none, EXPECT_BLOCK);
+iframeTestCORP("COEP:require-corp embeds same-origin COEP:credentialless",
+  parent_coep_require_corp, same_origin, coep_credentialless, EXPECT_BLOCK);
+iframeTestCORP("COEP:require-corp embeds cross-origin COEP:credentialless",
+  parent_coep_require_corp, cross_origin, coep_credentialless, EXPECT_BLOCK);
+iframeTestCORP("COEP:require-corp embeds same-origin COEP:require-corp",
+  parent_coep_require_corp, same_origin, coep_require_corp, EXPECT_LOAD);
+iframeTestCORP("COEP:require-corp embeds cross-origin COEP:require-corp",
+  parent_coep_require_corp, cross_origin, coep_require_corp, EXPECT_LOAD);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/common.js b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/common.js
index be6bb0ea5f6..45fd93503c0 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/common.js
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/common.js
@@ -1,9 +1,21 @@
 const directory = '/html/cross-origin-embedder-policy/credentialless';
-
 const executor_path = directory + '/resources/executor.html?pipe=';
-const coep_none = '|header(Cross-Origin-Embedder-Policy,none)';
+
+// COEP
+const coep_none =
+    '|header(Cross-Origin-Embedder-Policy,none)';
 const coep_credentialless =
     '|header(Cross-Origin-Embedder-Policy,credentialless)';
+const coep_require_corp =
+    '|header(Cross-Origin-Embedder-Policy,require-corp)';
+
+// COOP
+const coop_same_origin =
+    '|header(Cross-Origin-Opener-Policy,same-origin)';
+
+// CORP
+const corp_cross_origin =
+    '|header(Cross-Origin-Resource-Policy,cross-origin)';
 
 // Test using the modern async/await primitives are easier to read/write.
 // However they run sequentially, contrary to async_test. This is the parallel
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.js b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.js
index d1fd1b61d98..ed0e1ce9fbc 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.js
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.js
@@ -4,10 +4,28 @@ const dispatcher_path =
   "/html/cross-origin-embedder-policy/credentialless/resources/dispatcher.py";
 const dispatcher_url = new URL(dispatcher_path, location.href).href;
 
+// Return a promise, limiting the number of concurrent accesses to a shared
+// resources to |max_concurrent_access|.
+const concurrencyLimiter = (max_concurrency) => {
+  let pending = 0;
+  let waiting = [];
+  return async (task) => {
+    pending++;
+    if (pending > max_concurrency)
+      await new Promise(resolve => waiting.push(resolve));
+    await task();
+    pending--;
+    waiting.shift()?.();
+  };
+}
+
+// The official web-platform-test runner sometimes drop POST requests when
+// too many are requested in parallel. Limiting this document to send only one
+// at a time fixes the issue.
+const sendLimiter = concurrencyLimiter(1);
+
 const send = async function(uuid, message) {
-  // The official web-platform-test runner sometimes drop POST requests when
-  // many are requested in parallel. Using a lock fixes the issue.
-  await navigator.locks.request("dispatcher_send", async lock => {
+  await sendLimiter(async () => {
     await fetch(dispatcher_url + `?uuid=${uuid}`, {
       method: 'POST',
       body: message
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js
new file mode 100644
index 00000000000..1e3038e0e26
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js
@@ -0,0 +1,75 @@
+// One document embeds another in an iframe. Both are loaded from the network.
+// Depending on the response headers:
+// - Cross-Origin-Embedder-Policy (COEP)
+// - Cross-Origin-Resource-Policy (CORP)
+// The child must load or must be blocked.
+//
+// What to do for:
+// - COEP:credentialless
+// - COEP:credentialless-on-children
+// is currently an active open question. This test will be updated/completed
+// later.
+
+// There are no interoperable ways to check an iframe failed to load. So a
+// timeout is being used. See https://github.com/whatwg/html/issues/125
+// Moreover, we want to track progress, managing timeout explicitly allows to
+// get a per-test results, even in case of failure of one.
+setup({ explicit_timeout: true });
+
+const same_origin = get_host_info().HTTPS_ORIGIN;
+const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+
+// Open a new window loaded with the given |headers|. The new document will
+// execute any script sent toward the token it returns.
+const newWindow = (headers) => {
+  const executor_token = token();
+  const url = same_origin + executor_path + headers + `&uuid=${executor_token}`;
+  const w = window.open(url);
+  add_completion_callback(() => w.close());
+  return executor_token;
+};
+
+const EXPECT_LOAD = "load";
+const EXPECT_BLOCK = "block";
+
+// Load in iframe. Control both the parent and the child headers. Check whether
+// it loads or not.
+const iframeTest = function(
+  description,
+  parent_token,
+  child_origin,
+  child_headers,
+  expectation
+) {
+  promise_test_parallel(async test => {
+    const test_token = token();
+
+    const child_token = token();
+    const child_url = child_origin + executor_path + child_headers +
+      `&uuid=${child_token}`;
+
+    send(parent_token, `
+      let iframe = document.createElement("iframe");
+      iframe.src = "${child_url}";
+      document.body.appendChild(iframe);
+    `);
+
+    send(child_token, `
+      send("${test_token}", "load");
+    `);
+
+    // There are no interoperable ways to check an iframe failed to load. So a
+    // timeout is being used.
+    // See https://github.com/whatwg/html/issues/125
+    step_timeout(()=>send(test_token, "block"), 3000);
+
+    assert_equals(await receive(test_token), expectation);
+  }, description);
+}
+
+// A decorated version of iframeTest, adding CORP:cross-origin to the child.
+const iframeTestCORP = function() {
+  arguments[0] += ", CORP:cross-origin"; // description
+  arguments[3] += corp_cross_origin;     // child_headers
+  iframeTest(...arguments);
+}
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-001.html b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-001-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-001.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-001-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-002.html b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-002-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-002.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/events/events-non-draggable-002-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-001.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-001-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-001.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-001-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-002.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-002-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-002.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-002-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-003.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-003-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-003.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-003-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-004.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-004-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-004.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-004-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-005.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-005-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-005.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-005-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-006.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-006-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-006.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/close-drag-006-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-keypress.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-keypress-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-keypress.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-keypress-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-link.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-link-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-link.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-link-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-to-title.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-to-title-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-to-title.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/drag-to-title-manual.html
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag.html b/tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag-manual.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag.html
rename to tests/wpt/web-platform-tests/html/editing/dnd/platform/modifiers/releasemodifiersdrag-manual.html
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html
index 3f4221b7148..74f3334890b 100644
--- a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html
@@ -83,8 +83,9 @@ test(function() {
   var source = img.previousSibling;
   assert_equals(getComputedStyle(source).width, "auto");
   assert_equals(getComputedStyle(source).height, "auto");
+}, "Computed style for width/height/aspect-ratio");
 
-  // Source width/height should take precedence over img attributes.
+test(function() {
   img = createPicture(200, 100);
   img.setAttribute("width", 250);
   img.setAttribute("height", 50);
@@ -97,8 +98,9 @@ test(function() {
   source = img.previousSibling;
   assert_equals(getComputedStyle(source).width, "auto");
   assert_equals(getComputedStyle(source).height, "auto");
+}, "Source width/height should take precedence over img attributes.");
 
-  // Make sure style gets invalidated correctly when the source gets removed.
+test(function() {
   img.parentNode.removeChild(img.previousSibling);
   assert_cs(img, "auto 250 / 50");
   img.src = "/images/green.png";
@@ -107,9 +109,9 @@ test(function() {
   img.setAttribute("nowidth", "true");
   assert_equals(getComputedStyle(img).width, "250px");
   assert_equals(getComputedStyle(img).height, "50px");
+}, "Make sure style gets invalidated correctly when the source gets removed.");
 
-  // If the <source> has only one of width/height, we don't get an aspect
-  // ratio, even if the <img> has both.
+test(function() {
   img = createPicture(100, undefined);
   img.setAttribute("width", 200);
   img.setAttribute("height", 100);
@@ -118,16 +120,16 @@ test(function() {
   img.setAttribute("nowidth", "true");
   assert_equals(getComputedStyle(img).width, "100px");
   assert_equals(getComputedStyle(img).height, "auto");
+}, "If the <source> has only one of width/height, we don't get an aspect ratio, even if the <img> has both.");
 
-  // If we don't have width/height on the source, we fall back to width/height
-  // on the <img>.
+test(function() {
   img = createPicture(undefined, undefined);
   img.setAttribute("width", 200);
   img.setAttribute("height", 100);
   assert_cs(img, "auto 200 / 100");
+}, "If we don't have width/height on the source, we fall back to width/height on the <img>.");
 
-  // If we only have one width/height attribute, we should get that attribute
-  // mapped but no aspect ratio, even if <img> has attributes.
+test(function() {
   img = createPicture(100, undefined);
   img.parentNode.style.display = "none";
   img.setAttribute("width", "200");
@@ -145,8 +147,9 @@ test(function() {
   assert_cs(img, "auto");
   assert_equals(getComputedStyle(img).width, "auto");
   assert_equals(getComputedStyle(img).height, "100px");
+}, "If we only have one width/height attribute, we should get that attribute mapped but no aspect ratio, even if <img> has attributes.");
 
-  // Testing dynamic changes
+test(function() {
   img = createPicture(100, 100);
   assert_cs(img, "auto 100 / 100");
   img.previousSibling.setAttribute("height", "300");
@@ -157,7 +160,9 @@ test(function() {
   img.setAttribute("nowidth", "true");
   assert_equals(getComputedStyle(img).width, "10px");
   assert_equals(getComputedStyle(img).height, "300px");
+}, "Dynamically changing width/height should change computed style");
 
+test(function() {
   img = document.getElementById("twosource-img");
   assert_cs(img, "auto 100 / 100");
   source = document.getElementById("twosource-s1");
@@ -168,9 +173,9 @@ test(function() {
   img.setAttribute("nowidth", "true");
   assert_equals(getComputedStyle(img).width, "300px");
   assert_equals(getComputedStyle(img).height, "150px");
+}, "Changing which <source> matches should change computed style");
 
-  // Percentages on source should be ignored for aspect-ratio but used for
-  // width/height.
+test(function() {
   img = document.getElementById("percent-img");
   assert_equals(img.offsetWidth, 100);
   assert_equals(img.offsetHeight, 0);
@@ -182,8 +187,9 @@ test(function() {
   img.setAttribute("nowidth", "true");
   assert_equals(getComputedStyle(img).width, "100%");
   assert_equals(getComputedStyle(img).height, "50%");
+}, "Percentages on source should be ignored for aspect-ratio but used for width/height.");
 
-  // Trailing garbage should be ignored but not invalidate anything.
+test(function() {
   img = document.getElementById("trailing-img");
   assert_equals(img.offsetWidth, 100);
   assert_equals(img.offsetHeight, 50);
@@ -195,12 +201,30 @@ test(function() {
   img.setAttribute("nowidth", "true");
   assert_equals(getComputedStyle(img).width, "100px");
   assert_equals(getComputedStyle(img).height, "50px");
-}, "Computed style");
+}, "Trailing garbage should be ignored but not make the attribute invalid");
 
 onload = t.step_func_done(function() {
   let images = document.querySelectorAll("img");
-  assert_ratio(images[0], 2.0, "2.0 is the original aspect ratio of green-100x50.png");
-  assert_ratio(images[1], 2.0, "Loaded image's aspect ratio, at least by default, overrides width / height ratio.");
-  assert_ratio(images[2], 2.0, "Loaded image's aspect ratio, at least by default, overrides width / height ratio (2).");
+  var img = images[0];
+  assert_ratio(img, 2.0, "2.0 is the original aspect ratio of green-100x50.png");
+  assert_cs(img, "auto");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "auto");
+  assert_equals(getComputedStyle(img).height, "auto");
+  img = images[1];
+  assert_ratio(img, 2.0, "Loaded image's aspect ratio, at least by default, overrides width / height ratio.");
+  assert_cs(img, "auto 100 / 100");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "100px");
+  assert_equals(getComputedStyle(img).height, "100px");
+  img = images[2];
+  assert_ratio(img, 2.0, "Loaded image's aspect ratio, at least by default, overrides width / height ratio (2).");
+  assert_cs(img, "auto 100 / 100");
+  img.style.display = "none";
+  img.setAttribute("nowidth", "true");
+  assert_equals(getComputedStyle(img).width, "100px");
+  assert_equals(getComputedStyle(img).height, "100px");
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html
new file mode 100644
index 00000000000..f90724f4f63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.html
@@ -0,0 +1,22 @@
+<!doctype html>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+    promise_test(async test => {
+        const result = await import("./export-hello.js", { assert: { } });
+        assert_equals(result.default, "hello");
+    }, "Dynamic import with an empty assert clause should succeed");
+
+    promise_test(async test => {
+        const result = await import("./export-hello.js", { assert: { unsupportedAssertionKey: "unsupportedAssertionValue"} });
+        assert_equals(result.default, "hello");
+    }, "Dynamic import with an unsupported import assertion should succeed");
+
+    promise_test(test => {
+        return promise_rejects_js(test, TypeError,
+            import("./export-hello.js", { assert: { type: "notARealType"} } ),
+            "Dynamic import with an unsupported type assertion should fail");
+    }, "Dynamic import with an unsupported type assertion should fail");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js
new file mode 100644
index 00000000000..34b58e6e126
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/export-hello.js
@@ -0,0 +1 @@
+export default "hello";
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.html
new file mode 100644
index 00000000000..d1c2182102c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.html
@@ -0,0 +1,68 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script>
+    promise_test(async test => {
+        await promise_rejects_js(test, TypeError,
+          import("./module.json"),
+          "Dynamic import of a JSON module without a type assertion should fail");
+
+        // This time the import should succeed because we're using the correct
+        // import even though the previous attempt with the same  specifier failed.
+        const result = await import("./module.json", { assert: { type: "json" } });
+        assert_true(result.default.test);
+    }, "Importing a specifier that previously failed due to an incorrect type assertion can succeed if the correct assertion is later given");
+
+    promise_test(async test => {
+        // Append a URL fragment to the specifier so that this is independent
+        // from the previous test.
+        const result = await import("./module.json#2", { assert: { type: "json" } });
+        assert_true(result.default.test);
+
+        await promise_rejects_js(test, TypeError,
+          import("./module.json#2"),
+          "Dynamic import should fail with the type assertion missing even if the same specifier previously succeeded");
+    }, "Importing a specifier that previously succeeded with the correct type assertion should fail if the incorrect assertion is later given");
+
+    promise_test(async test => {
+        const uuid_token = token();
+        // serve-json-then-js.py gives us JSON the first time
+        const result_json = await import(`../serve-json-then-js.py?key=${uuid_token}`, { assert: { type: "json" } });
+        assert_equals(result_json.default.hello, "world");
+
+        // Import using the same specifier again; this time we get JS, which
+        // should succeed since we're not asserting a non-JS type this time.
+        const result_js = await import(`../serve-json-then-js.py?key=${uuid_token}`);
+        assert_equals(result_js.default, "hello");
+    }, "Two modules of different type with the same specifier can load if the server changes its responses");
+
+    promise_test(async test => {
+        const uuid_token = token();
+        // serve-json-then-js.py gives us JSON the first time
+        await promise_rejects_js(test, TypeError,
+          import(`../serve-json-then-js.py?key=${uuid_token}`),
+          "Dynamic import of JS with a JSON type assertion should fail");
+
+        // Import using the same specifier/module type pair again; this time we get JS,
+        // but the import should still fail because the module map entry for this
+        // specifier/module type pair already contains a failure.
+        await promise_rejects_js(test, TypeError,
+          import(`../serve-json-then-js.py?key=${uuid_token}`),
+          "import should always fail if the same specifier/type assertion pair failed previously");
+    }, "An import should always fail if the same specifier/type assertion pair failed previously");
+
+    promise_test(async test => {
+        const uuid_token = token();
+        // serve-json-then-js.py gives us JSON the first time
+        const result_json = await import(`../serve-json-then-js.py?key=${uuid_token}`, { assert: { type: "json" } });
+        assert_equals(result_json.default.hello, "world");
+
+        // If this were to do another fetch, the import would fail because
+        // serve-json-then-js.py would give us JS this time. But, the module map
+        // entry for this specifier/module type pair already exists, so we
+        // successfully reuse the entry instead of fetching again.
+        const result_json_2 = await import(`../serve-json-then-js.py?key=${uuid_token}`, { assert: { type: "json" } });
+        assert_equals(result_json_2.default.hello, "world");
+    }, "If an import previously succeeded for a given specifier/type assertion pair, future uses of that pair should yield the same result");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py
new file mode 100644
index 00000000000..9610734d444
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/serve-json-then-js.py
@@ -0,0 +1,21 @@
+# Respond with valid JSON to the first request with the given key,
+# and with valid JavaScript to the second. Used for testing scenarios where
+# the same request URL results in different responses on subsequent requests.
+def main(request, response):
+    try:
+        stash_key = request.GET.first(b"key")
+
+        run_count = request.server.stash.take(stash_key)
+        if not run_count:
+            run_count = 0
+
+        if run_count == 0:
+            response.headers.set(b"Content-Type", b"text/json")
+            response.content = '{"hello": "world"}'
+        else:
+            response.headers.set(b"Content-Type", b"application/javascript")
+            response.content = "export default 'hello';"
+
+        request.server.stash.put(stash_key, run_count + 1)
+    except:
+        response.set_error(400, u"Not enough parameters")
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 08cc505da91..6e1a4a133d7 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -397,6 +397,8 @@ interface HTMLSourceElement : HTMLElement {
   [CEReactions] attribute USVString srcset;
   [CEReactions] attribute DOMString sizes;
   [CEReactions] attribute DOMString media;
+  [CEReactions] attribute unsigned long width;
+  [CEReactions] attribute unsigned long height;
 };
 
 [Exposed=Window,
diff --git a/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html b/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html
new file mode 100644
index 00000000000..e1d1565d842
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-insertable-streams/MediaStreamTrackGenerator-video.https.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>MediaStream Insertable Streams - Video</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+async function getVideoFrame() {
+  const stream = await navigator.mediaDevices.getUserMedia({video: true});
+  const input_track = stream.getTracks()[0];
+  const processor = new MediaStreamTrackProcessor(input_track);
+  const reader = processor.readable.getReader();
+  const result = await reader.read();
+  input_track.stop();
+  return result.value;
+}
+
+promise_test(async t => {
+  const videoFrame = await getVideoFrame();
+  const originalWidth = videoFrame.displayWidth;
+  const originalHeight = videoFrame.displayHeight;
+  const originalTimestamp = videoFrame.timestamp;
+  const generator = new MediaStreamTrackGenerator({kind: 'video'});
+
+  // Use a MediaStreamTrackProcessor as a sink for |generator| to verify
+  // that |processor| actually forwards the frames written to its writable
+  // field.
+  const processor = new MediaStreamTrackProcessor(generator);
+  const reader = processor.readable.getReader();
+  const readerPromise = new Promise(async resolve => {
+    const result = await reader.read();
+    assert_equals(result.value.displayWidth, originalWidth);
+    assert_equals(result.value.displayHeight, originalHeight);
+    assert_equals(result.value.timestamp, originalTimestamp);
+    resolve();
+  });
+
+  generator.writable.getWriter().write(videoFrame);
+  return readerPromise;
+}, 'MediaStreamTrackGenerator forwards frames to sink');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/native-io/capacity_allocation_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/capacity_allocation_async_basic.tentative.https.any.js
new file mode 100644
index 00000000000..93e2e9873a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/capacity_allocation_async_basic.tentative.https.any.js
@@ -0,0 +1,37 @@
+// META: title=NativeIO API: Acquiring, displaying and releasing capacity.
+// META: global=window,worker
+
+'use strict';
+
+promise_test(async testCase => {
+  const available_capacity = await storageFoundation.getRemainingCapacity();
+  assert_equals(available_capacity, 0);
+}, 'The starting capacity of a NativeIOFileManager is 0');
+
+promise_test(async testCase => {
+  const requested_capacity = 4;
+  const granted_capacity = await storageFoundation.requestCapacity(requested_capacity);
+  const available_capacity = await storageFoundation.getRemainingCapacity();
+  assert_equals(available_capacity, granted_capacity);
+  testCase.add_cleanup(async () => {
+    await storageFoundation.releaseCapacity(available_capacity);
+  });
+}, 'getRemainingCapacity() reports the capacity granted by requestCapacity()');
+
+promise_test(async testCase => {
+  const requested_capacity = 4;
+  const granted_capacity = await storageFoundation.requestCapacity(requested_capacity);
+  await storageFoundation.releaseCapacity(granted_capacity);
+  const available_capacity = await storageFoundation.getRemainingCapacity();
+  assert_equals(available_capacity, 0);
+}, 'getRemainingCapacity() reports zero after a releaseCapacity() matching ' +
+   'the capacity granted by a requestCapacity().');
+
+promise_test(async testCase => {
+  const requested_capacity = 4;
+  const granted_capacity = await storageFoundation.requestCapacity(requested_capacity);
+  assert_greater_than_equal(granted_capacity, requested_capacity);
+  testCase.add_cleanup(async () => {
+    await storageFoundation.releaseCapacity(granted_capacity);
+  });
+}, 'requestCapacity() grants the requested capacity for small requests');
diff --git a/tests/wpt/web-platform-tests/native-io/capacity_allocation_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/capacity_allocation_sync_basic.tentative.https.any.js
new file mode 100644
index 00000000000..3ec2db383ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/capacity_allocation_sync_basic.tentative.https.any.js
@@ -0,0 +1,38 @@
+// META: title=NativeIO API: Acquiring, displaying and releasing capacity.
+// META: global=dedicatedworker
+
+'use strict';
+
+test(testCase => {
+  const available_capacity = storageFoundation.getRemainingCapacitySync();
+  assert_equals(available_capacity, 0);
+}, 'The starting capacity of a NativeIOFileManager is 0');
+
+test(testCase => {
+  const requested_capacity = 4;
+  const granted_capacity = storageFoundation.requestCapacitySync(requested_capacity);
+  const available_capacity = storageFoundation.getRemainingCapacitySync();
+  assert_equals(available_capacity, granted_capacity);
+  testCase.add_cleanup(() => {
+    storageFoundation.releaseCapacitySync(available_capacity);
+  });
+}, 'getRemainingCapacitySync() reports the capacity granted by ' +
+    'requestCapacitySync()');
+
+test(testCase => {
+  const requested_capacity = 4;
+  const granted_capacity = storageFoundation.requestCapacitySync(requested_capacity);
+  storageFoundation.releaseCapacitySync(granted_capacity);
+  const available_capacity = storageFoundation.getRemainingCapacitySync();
+  assert_equals(available_capacity, 0);
+}, 'getRemainingCapacitySync() reports zero after a releaseCapacitySync() ' +
+    'matching the capacity granted by a requestCapacitySync().');
+
+test(testCase => {
+  const requested_capacity = 4;
+  const granted_capacity = storageFoundation.requestCapacitySync(requested_capacity);
+  assert_greater_than_equal(granted_capacity, requested_capacity);
+  testCase.add_cleanup(() => {
+    storageFoundation.releaseCapacitySync(granted_capacity);
+  });
+}, 'requestCapacitySync() grants the requested capacity for small requests');
diff --git a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
index 1a7c680084c..30b46594aff 100644
--- a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
@@ -6,6 +6,8 @@
 'use strict';
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
 
@@ -13,6 +15,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.close is idempotent');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   const closePromise = file.close();
 
@@ -21,6 +25,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.close is idempotent when called immediately');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
 
@@ -31,6 +37,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.read fails after NativeIOFile.close settles');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   const closePromise = file.close();
 
@@ -42,6 +50,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.read fails immediately after calling NativeIOFile.close');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
 
@@ -53,6 +63,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.write fails after NativeIOFile.close settles');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   const closePromise = file.close();
 
@@ -65,6 +77,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.write fails immediately after calling NativeIOFile.close');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
 
@@ -72,6 +86,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.getLength fails after NativeIOFile.close settles');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   const closePromise = file.close();
 
@@ -80,6 +96,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.getLength fails immediately after calling NativeIOFile.close');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
 
@@ -87,6 +105,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.flush fails after NativeIOFile.close settles');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   const closePromise = file.close();
 
@@ -95,6 +115,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.flush fails immediately after calling NativeIOFile.close');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
 
@@ -102,6 +124,8 @@ promise_test(async testCase => {
 }, 'NativeIOFile.setLength fails after NativeIOFile.close settles');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, 'file_name');
   const closePromise = file.close();
 
diff --git a/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
index a0abf5ca4e0..c298a79ede1 100644
--- a/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
@@ -1,26 +1,12 @@
 // META: title=Synchronous NativeIO API: close().
 // META: global=dedicatedworker
+// META: script=resources/support.js
 
 'use strict';
 
-// Returns a handle to a newly created file that holds some data.
-//
-// The file will be closed and deleted when the test ends.
-function createFileSync(testCase, fileName) {
-  const file = storageFoundation.openSync(fileName);
-  testCase.add_cleanup(() => {
-    file.close();
-    storageFoundation.deleteSync(fileName);
-  });
-
-  const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
-  const writeCount = file.write(writtenBytes, 0);
-  assert_equals(writeCount, 4);
-
-  return file;
-}
-
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, 'file_name');
   assert_equals(undefined, file.close());
 
@@ -28,6 +14,8 @@ test(testCase => {
 }, 'NativeIOFileSync.close is idempotent');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, 'file_name');
   assert_equals(undefined, file.close());
 
@@ -36,6 +24,8 @@ test(testCase => {
 }, 'NativeIOFileSync.read fails after NativeIOFileSync.close');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, 'file_name');
   assert_equals(undefined, file.close());
 
@@ -44,6 +34,8 @@ test(testCase => {
 }, 'NativeIOFile.write fails after NativeIOFile.close');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, 'file_name');
   assert_equals(undefined, file.close());
 
@@ -51,6 +43,8 @@ test(testCase => {
 }, 'NativeIOFileSync.getLength fails after NativeIOFileSync.close');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, 'file_name');
   assert_equals(undefined, file.close());
 
@@ -58,6 +52,8 @@ test(testCase => {
 }, 'NativeIOFileSync.flush fails after NativeIOFileSync.close');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, 'file_name');
   assert_equals(undefined, file.close());
 
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js
index 518527821e7..1eb031ce6a1 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js
@@ -10,6 +10,8 @@
 
 for (let op of kOperations) {
   promise_test(async testCase => {
+    await reserveAndCleanupCapacity(testCase);
+
     const file = await createFile(testCase, 'flush_file');
 
     const res = op.prepare();
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_getLength_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_getLength_async.tentative.https.any.js
index d542188738e..eee22bf4d80 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_getLength_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_getLength_async.tentative.https.any.js
@@ -9,6 +9,8 @@
 
 for (let op of kOperations) {
   promise_test(async testCase => {
+    await reserveAndCleanupCapacity(testCase);
+
     const file = await createFile(testCase, 'getlength_file');
 
     const res = op.prepare();
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js
index fb98fed67ca..bf76fb11337 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_read_async.tentative.https.any.js
@@ -10,6 +10,8 @@
 
 for (let op of kOperations) {
   promise_test(async testCase => {
+    await reserveAndCleanupCapacity(testCase);
+
     const file = await createFile(testCase, 'read_file');
 
     const readSharedArrayBuffer = new SharedArrayBuffer(4);
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
index 2d7617d011c..79f7e799596 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
@@ -10,6 +10,8 @@
 
 for (let op of kOperations) {
   promise_test(async testCase => {
+    await reserveAndCleanupCapacity(testCase);
+
     const file = await createFile(testCase, 'setlength_file');
 
     const res = op.prepare();
@@ -22,11 +24,11 @@ for (let op of kOperations) {
     const readSharedArrayBuffer = new SharedArrayBuffer(5);
     const readBytes = new Uint8Array(readSharedArrayBuffer);
     assert_equals(await file.read(readBytes, 0), 5,
-                  `NativeIOFile.read() should not fail after a rejected ` +
-                    `${op.name}() during setLength().`);
+      `NativeIOFile.read() should not fail after a rejected ` +
+      `${op.name}() during setLength().`);
     assert_array_equals(readBytes, [64, 65, 66, 67, 0],
-                        `Rejecting ${op.name}() during setLength()` +
-                          ` should not change the file.`);
+      `Rejecting ${op.name}() during setLength()` +
+      ` should not change the file.`);
     op.assertUnchanged(res);
   }, `${op.name}() rejects while setLength() is resolving.`);
 };
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js
index 729bee3a083..2fe9cb396af 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_write_async.tentative.https.any.js
@@ -10,6 +10,8 @@
 
 for (let op of kOperations) {
   promise_test(async testCase => {
+    await reserveAndCleanupCapacity(testCase);
+
     const file = await createFile(testCase, 'write_file');
 
     const writeSharedArrayBuffer = new SharedArrayBuffer(4);
diff --git a/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
index 9219725c4c2..d5ed466dab1 100644
--- a/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/flush_async_basic.tentative.https.any.js
@@ -6,26 +6,17 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await storageFoundation.open('test_file');
-  testCase.add_cleanup(async () => {
-    await file.close();
-    await storageFoundation.delete('test_file');
-  });
+  await reserveAndCleanupCapacity(testCase);
 
   const size = 1024;
-  const longarray = createLargeArray(size, /*seed = */ 103);
-  const writeSharedArrayBuffer = new SharedArrayBuffer(size);
-  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
-  writtenBytes.set(longarray);
-  const writeCount = await file.write(writtenBytes, 0);
-  assert_equals(
-      writeCount, size,
-      'NativeIOFile.write() should resolve with the number of bytes written');
+  const longArray = createLargeArray(size, /*seed = */ 103);
+
+  const file = await createFile(testCase, 'test_file', longArray);
 
   await file.flush();
   const readBytes = await readIoFile(file);
 
-  assert_array_equals(readBytes, writtenBytes,
+  assert_array_equals(readBytes, longArray,
                       'the bytes read should match the bytes written');
 }, 'NativeIOFile.read returns bytes written by NativeIOFile.write' +
      ' after NativeIOFile.flush');
diff --git a/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js
index 4aa22267f61..128dcede7a9 100644
--- a/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/flush_sync_basic.tentative.https.any.js
@@ -5,24 +5,17 @@
 'use strict';
 
 test(testCase => {
-  const file = storageFoundation.openSync('test_file');
-  testCase.add_cleanup(() => {
-    file.close();
-    storageFoundation.deleteSync('test_file');
-  });
+  reserveAndCleanupCapacitySync(testCase);
 
   const size = 1024;
-  const longarray = createLargeArray(size, /*seed = */ 107);
-  const writtenBytes = Uint8Array.from(longarray);
-  const writeCount = file.write(writtenBytes, 0);
-  assert_equals(
-      writeCount, size,
-      'NativeIOFile.write() should resolve with the number of bytes written');
+  const longArray = createLargeArray(size, /*seed = */ 107);
+
+  const file = createFileSync(testCase, 'test_file', longArray);
 
   file.flush();
   const readBytes = readIoFileSync(file);
 
-  assert_array_equals(readBytes, writtenBytes,
-                      'the bytes read should match the bytes written');
+  assert_array_equals(readBytes, longArray,
+    'the bytes read should match the bytes written');
 }, 'NativeIOFileSync.read returns bytes written by NativeIOFileSync.write' +
-     ' after NativeIOFileSync.flush');
+    ' after NativeIOFileSync.flush');
diff --git a/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
index 38ebcc29409..bd3f9b3a148 100644
--- a/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
@@ -5,16 +5,9 @@
 'use strict';
 
 promise_test(async testCase => {
-  const file = await storageFoundation.open('test_file');
-  testCase.add_cleanup(async () => {
-    await file.close();
-    await storageFoundation.delete('test_file');
-  });
+  await reserveAndCleanupCapacity(testCase);
 
-  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
-  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
-  writtenBytes.set([97, 98, 99, 100]);
-  await file.write(writtenBytes, 0);
+  const file = await createFile(testCase, 'test_file', [97, 98, 99, 100]);
 
   await file.setLength(3);
   const readBytes = await readIoFile(file);
@@ -29,16 +22,9 @@ promise_test(async testCase => {
       'new length');
 
 promise_test(async testCase => {
-  const file = await storageFoundation.open('test_file');
-  testCase.add_cleanup(async () => {
-    await file.close();
-    await storageFoundation.delete('test_file');
-  });
+  await reserveAndCleanupCapacity(testCase);
 
-  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
-  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
-  writtenBytes.set([97, 98, 99, 100]);
-  await file.write(writtenBytes, 0);
+  const file = await createFile(testCase, 'test_file', [97, 98, 99, 100]);
 
   await file.setLength(5);
   const readBytes = await readIoFile(file);
diff --git a/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
index 28057c9db7e..b93ad155810 100644
--- a/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
@@ -5,35 +5,25 @@
 'use strict';
 
 test(testCase => {
-  const file = storageFoundation.openSync('test_file');
-  testCase.add_cleanup(() => {
-    file.close();
-    storageFoundation.deleteSync('test_file');
-  });
+  reserveAndCleanupCapacitySync(testCase);
 
-  const writtenBytes = Uint8Array.from([97, 98, 99, 100]);
-  file.write(writtenBytes, 0);
+  const file = createFileSync(testCase, 'test_file', [97, 98, 99, 100]);
 
   file.setLength(3);
   const readBytes = readIoFileSync(file);
 
   const remainingBytes = Uint8Array.from([97, 98, 99]);
   assert_array_equals(
-      readBytes, remainingBytes,
-      'NativeIOFileSync.setLength() should remove bytes from the end of ' +
-        'a file when decreasing its length.');
+    readBytes, remainingBytes,
+    'NativeIOFileSync.setLength() should remove bytes from the end of ' +
+    'a file when decreasing its length.');
 }, 'NativeIOFileSync.setLength shrinks a file and' +
-     ' NativeIOFileSync.getLength reports its new length.');
+' NativeIOFileSync.getLength reports its new length.');
 
 test(testCase => {
-  const file = storageFoundation.openSync('test_file');
-  testCase.add_cleanup(() => {
-    file.close();
-    storageFoundation.deleteSync('test_file');
-  });
+  reserveAndCleanupCapacitySync(testCase);
 
-  const writtenBytes = Uint8Array.from([97, 98, 99, 100]);
-  file.write(writtenBytes, 0);
+  const file = createFileSync(testCase, 'test_file', [97, 98, 99, 100]);
 
   file.setLength(5);
   const readBytes = readIoFileSync(file);
@@ -41,8 +31,8 @@ test(testCase => {
   const expectedBytes = Uint8Array.from([97, 98, 99, 100, 0]);
 
   assert_array_equals(
-      readBytes, expectedBytes,
-      'NativeIOFileSync.setLength() should append zeros when increasing' +
-        ' the file size.');
+    readBytes, expectedBytes,
+    'NativeIOFileSync.setLength() should append zeros when increasing' +
+    ' the file size.');
 }, 'NativeIOFileSync.setLength appends zeros to a file and ' +
-     'NativeIOFileSync.getLength reports its new length.');
+'NativeIOFileSync.getLength reports its new length.');
diff --git a/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js
index a0273242144..59e9094a028 100644
--- a/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/read_write_async_basic.tentative.https.any.js
@@ -1,9 +1,12 @@
 // META: title=NativeIO API: Written bytes are read back.
 // META: global=window,worker
+// META: script=resources/support.js
 
 'use strict';
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
diff --git a/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js
index 61c5e3f3225..7905ff73012 100644
--- a/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/read_write_sync_basic.tentative.https.any.js
@@ -1,9 +1,13 @@
 // META: title=Synchronous NativeIO API: Written bytes are read back.
 // META: global=dedicatedworker
+// META: script=resources/support.js
 
 'use strict';
 
+
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
diff --git a/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
index 546ba7a9ecc..0067f76b352 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_async_failure_handling.tentative.https.any.js
@@ -11,6 +11,8 @@ setup(async () => {
 });
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file1 = await storageFoundation.open('test_file_1');
   const file2 = await storageFoundation.open('test_file_2');
   testCase.add_cleanup(async () => {
@@ -64,6 +66,8 @@ promise_test(async testCase => {
 }, 'storageFoundation.rename does not overwrite an existing file.');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await storageFoundation.open('test_file');
   testCase.add_cleanup(async () => {
     await file.close();
@@ -80,6 +84,8 @@ promise_test(async testCase => {
 }, 'storageFoundation.rename does not allow renaming an open file.');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   testCase.add_cleanup(async () => {
     await file.close();
     await storageFoundation.delete('test_file');
@@ -99,6 +105,8 @@ promise_test(async testCase => {
 }, 'storageFoundation.rename does not allow renaming from or to invalid names.');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const closed_file = await storageFoundation.open('closed_file');
   closed_file.close();
   const opened_file = await storageFoundation.open('opened_file');
@@ -120,6 +128,8 @@ promise_test(async testCase => {
 }, 'Failed storageFoundation.rename does not unlock the source.');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const closed_file = await storageFoundation.open('closed_file');
   await closed_file.close();
   const opened_file = await storageFoundation.open('opened_file');
@@ -141,6 +151,8 @@ promise_test(async testCase => {
 }, 'Failed storageFoundation.rename does not unlock the destination.');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   // Make sure that the file does not exist.
   await storageFoundation.delete('does_not_exist');
   testCase.add_cleanup(async () => {
diff --git a/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js
index b86efa8acd0..583584b1d42 100644
--- a/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/rename_sync_failure_handling.tentative.https.any.js
@@ -12,6 +12,8 @@ setup(() => {
 });
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file1 = storageFoundation.openSync('test_file_1');
   const file2 = storageFoundation.openSync('test_file_2');
   testCase.add_cleanup(() => {
@@ -58,6 +60,8 @@ test(testCase => {
 }, 'storageFoundation.renameSync does not overwrite an existing file.');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = storageFoundation.openSync('test_file');
   testCase.add_cleanup(() => {
     file.close();
@@ -74,6 +78,8 @@ test(testCase => {
 }, 'storageFoundation.renameSync allows renaming an open file.');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   testCase.add_cleanup(() => {
     file.close();
     storageFoundation.deleteSync('test_file');
@@ -94,6 +100,8 @@ test(testCase => {
      ' names.');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const closed_file = storageFoundation.openSync('closed_file');
   closed_file.close();
   const opened_file = storageFoundation.openSync('opened_file');
@@ -115,6 +123,8 @@ test(testCase => {
 }, 'Failed storageFoundation.renameSync does not unlock the source.');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const closed_file = storageFoundation.openSync('closed_file');
   closed_file.close();
   const opened_file = storageFoundation.openSync('opened_file');
@@ -136,6 +146,8 @@ test(testCase => {
 }, 'Failed storageFoundation.renameSync does not unlock the destination.');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   // Make sure that the file does not exist.
   storageFoundation.deleteSync('does_not_exist');
   testCase.add_cleanup(() => {
diff --git a/tests/wpt/web-platform-tests/native-io/resources/support.js b/tests/wpt/web-platform-tests/native-io/resources/support.js
index 69d5fc86c83..d8c0a23dba3 100644
--- a/tests/wpt/web-platform-tests/native-io/resources/support.js
+++ b/tests/wpt/web-platform-tests/native-io/resources/support.js
@@ -7,21 +7,25 @@ const kBadNativeIoNames = [
   'x'.repeat(101),
 ];
 
+const kDefaultCapacity = 1024 * 1024;
+
 // Returns a handle to a newly created file that holds some data.
 //
 // The file will be closed and deleted when the test ends.
-async function createFile(testCase, fileName) {
+async function createFile(testCase, fileName, data = [64, 65, 66, 67]) {
   const file = await storageFoundation.open(fileName);
+
   testCase.add_cleanup(async () => {
     await file.close();
     await storageFoundation.delete(fileName);
   });
 
-  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
+  const writeSharedArrayBuffer = new SharedArrayBuffer(data.length);
   const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
-  writtenBytes.set([64, 65, 66, 67]);
+  writtenBytes.set(data);
   const writeCount = await file.write(writtenBytes, 0);
-  assert_equals(writeCount, 4);
+  assert_equals(writeCount, data.length,
+    'NativeIOFile.write() should resolve with the number of bytes written');
 
   return file;
 }
@@ -29,16 +33,17 @@ async function createFile(testCase, fileName) {
 // Returns a handle to a newly created file that holds some data.
 //
 // The file will be closed and deleted when the test ends.
-function createFileSync(testCase, fileName) {
+function createFileSync(testCase, fileName, data = [64, 65, 66, 67]) {
   const file = storageFoundation.openSync(fileName);
   testCase.add_cleanup(() => {
     file.close();
     storageFoundation.deleteSync(fileName);
   });
 
-  const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
+  const writtenBytes = Uint8Array.from(data);
   const writeCount = file.write(writtenBytes, 0);
-  assert_equals(writeCount, 4);
+  assert_equals(writeCount, data.length,
+    'NativeIOFileSync.write() should resolve with the number of bytes written');
 
   return file;
 }
@@ -78,3 +83,24 @@ function readIoFileSync(file) {
   file.read(readBuffer, 0);
   return readBuffer;
 }
+
+// Default capacity allocation for non-quota related tests.
+async function reserveAndCleanupCapacity(testCase,
+                                         capacity = kDefaultCapacity) {
+  const grantedCapacity = await storageFoundation.requestCapacity(capacity);
+  testCase.add_cleanup(async () => {
+    let available_capacity = await storageFoundation.getRemainingCapacity();
+    await storageFoundation.releaseCapacity(available_capacity);
+  });
+  assert_greater_than_equal(grantedCapacity, capacity);
+}
+
+// Default capacity allocation for non-quota related sync tests.
+function reserveAndCleanupCapacitySync(testCase, capacity = kDefaultCapacity) {
+  const grantedCapacity = storageFoundation.requestCapacitySync(capacity);
+  testCase.add_cleanup(() => {
+    let available_capacity = storageFoundation.getRemainingCapacitySync();
+    storageFoundation.releaseCapacitySync(available_capacity);
+  });
+  assert_greater_than_equal(grantedCapacity, capacity);
+}
diff --git a/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js
index b00370c47f5..8882bf2562f 100644
--- a/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js
@@ -5,6 +5,8 @@
 'use strict';
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, "file_length_zero");
   await file.setLength(0);
   const lengthDecreased = await file.getLength();
@@ -14,6 +16,8 @@ promise_test(async testCase => {
      'file length to 0.');
 
 promise_test(async testCase => {
+  await reserveAndCleanupCapacity(testCase);
+
   const file = await createFile(testCase, "file_length_negative");
   await promise_rejects_js(testCase, TypeError,
                            file.setLength(-1));
diff --git a/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js
index d95752fdd8e..99b4452be64 100644
--- a/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js
@@ -5,6 +5,8 @@
 'use strict';
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, "file_length_zero");
   file.setLength(0);
   const lengthDecreased = file.getLength();
@@ -14,6 +16,8 @@ test(testCase => {
      'the file length to 0.');
 
 test(testCase => {
+  reserveAndCleanupCapacitySync(testCase);
+
   const file = createFileSync(testCase, "file_length_negative");
 
   // Without this assertion, the test passes even if setLength is not defined.
diff --git a/tests/wpt/web-platform-tests/native-io/setLength_capacity_allocation_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/setLength_capacity_allocation_async.tentative.https.any.js
new file mode 100644
index 00000000000..812f8555ee6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/setLength_capacity_allocation_async.tentative.https.any.js
@@ -0,0 +1,53 @@
+// META: title=NativeIO API: SetLength respects the allocated capacities.
+// META: global=window,worker
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+  });
+  await promise_rejects_dom(testCase, 'QuotaExceededError', file.setLength(4));
+}, 'setLength() fails without any capacity request.');
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+
+  const granted_capacity = await storageFoundation.requestCapacity(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+    await storageFoundation.releaseCapacity(1);
+  });
+
+  file.setLength(granted_capacity - 1);
+}, 'setLength() succeeds when given the granted capacity - 1');
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+
+  const granted_capacity = await storageFoundation.requestCapacity(4);
+  assert_greater_than_equal(granted_capacity, 1);
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+  });
+
+  file.setLength(granted_capacity);
+}, 'setLength() succeeds when given the granted capacity');
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+
+  const granted_capacity = await storageFoundation.requestCapacity(4);
+  assert_greater_than_equal(granted_capacity, 0);
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+    await storageFoundation.releaseCapacity(granted_capacity);
+  });
+
+  await promise_rejects_dom(
+    testCase, 'QuotaExceededError', file.setLength(granted_capacity + 1));
+}, 'setLength() fails when given the granted capacity + 1');
diff --git a/tests/wpt/web-platform-tests/native-io/setLength_capacity_allocation_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/setLength_capacity_allocation_sync.tentative.https.any.js
new file mode 100644
index 00000000000..6c71af5bbe0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/setLength_capacity_allocation_sync.tentative.https.any.js
@@ -0,0 +1,53 @@
+// META: title=NativeIO API: SetLength respects the allocated capacities.
+// META: global=dedicatedworker
+
+test(testCase => {
+  const file = storageFoundation.openSync('test_file');
+  testCase.add_cleanup(() => {
+    file.close();
+    storageFoundation.deleteSync('test_file');
+  });
+  assert_throws_dom('QuotaExceededError', () => {file.setLength(4)});
+}, 'setLength() fails without any capacity request.');
+
+test(testCase => {
+  const file = storageFoundation.openSync('test_file');
+
+  const granted_capacity = storageFoundation.requestCapacitySync(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(() => {
+    file.close();
+    storageFoundation.deleteSync('test_file');
+    storageFoundation.releaseCapacitySync(1);
+  });
+
+  file.setLength(granted_capacity - 1);
+}, 'setLength() succeeds when given the granted capacity - 1');
+
+test(testCase => {
+  const file = storageFoundation.openSync('test_file');
+
+  const granted_capacity = storageFoundation.requestCapacitySync(4);
+  assert_greater_than_equal(granted_capacity, 1);
+  testCase.add_cleanup(() => {
+    file.close();
+    storageFoundation.deleteSync('test_file');
+  });
+
+  file.setLength(granted_capacity);
+}, 'setLength() succeeds when given the granted capacity');
+
+test(testCase => {
+  const file = storageFoundation.openSync('test_file');
+
+  const granted_capacity = storageFoundation.requestCapacitySync(4);
+  assert_greater_than_equal(granted_capacity, 0);
+  testCase.add_cleanup(() => {
+    file.close();
+    storageFoundation.deleteSync('test_file');
+    storageFoundation.releaseCapacitySync(granted_capacity);
+  });
+
+  assert_throws_dom('QuotaExceededError',
+                    () => {file.setLength(granted_capacity + 1)});
+}, 'setLength() fails when given the granted capacity + 1');
diff --git a/tests/wpt/web-platform-tests/native-io/write_capacity_allocation_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/write_capacity_allocation_async.tentative.https.any.js
new file mode 100644
index 00000000000..d5d9297e2c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/write_capacity_allocation_async.tentative.https.any.js
@@ -0,0 +1,66 @@
+// META: title=NativeIO API: Write respects the allocated capacities.
+// META: global=window,worker
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+  });
+  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
+  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
+  writtenBytes.set([64, 65, 66, 67]);
+  await promise_rejects_dom(
+    testCase, 'QuotaExceededError', file.write(writtenBytes, 0));
+}, 'write() fails without any capacity request.');
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+
+  const granted_capacity = await storageFoundation.requestCapacity(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+    await storageFoundation.releaseCapacity(1);
+  });
+  const writeSharedArrayBuffer = new SharedArrayBuffer(granted_capacity - 1);
+  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
+  writtenBytes.set(Array(granted_capacity - 1).fill(64));
+
+  file.write(writtenBytes, 0);
+}, 'write() succeeds when given a buffer of length granted capacity - 1');
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+
+  const granted_capacity = await storageFoundation.requestCapacity(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+  });
+  const writeSharedArrayBuffer = new SharedArrayBuffer(granted_capacity);
+  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
+  writtenBytes.set(Array(granted_capacity).fill(64));
+
+  file.write(writtenBytes, 0);
+}, 'write() succeeds when given the granted capacity');
+
+promise_test(async testCase => {
+  const file = await storageFoundation.open('test_file');
+
+  const granted_capacity = await storageFoundation.requestCapacity(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await storageFoundation.delete('test_file');
+    await storageFoundation.releaseCapacity(granted_capacity);
+  });
+  const writeSharedArrayBuffer = new SharedArrayBuffer(granted_capacity + 1);
+  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
+  writtenBytes.set(Array(granted_capacity + 1).fill(64));
+
+  await promise_rejects_dom(testCase,
+    'QuotaExceededError', file.write(writtenBytes, 0));
+}, 'write() fails when given the granted capacity + 1');
diff --git a/tests/wpt/web-platform-tests/native-io/write_capacity_allocation_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/write_capacity_allocation_sync.tentative.https.any.js
new file mode 100644
index 00000000000..ff31c78edac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/write_capacity_allocation_sync.tentative.https.any.js
@@ -0,0 +1,57 @@
+// META: title=NativeIO API: Write respects the allocated capacities.
+// META: global=dedicatedworker
+
+test(testCase => {
+  const file =  storageFoundation.openSync('test_file');
+  testCase.add_cleanup(() => {
+     file.close();
+     storageFoundation.deleteSync('test_file');
+  });
+  const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
+  assert_throws_dom('QuotaExceededError', () => {file.write(writtenBytes, 0)});
+}, 'write() fails without any capacity request.');
+
+test(testCase => {
+  const file =  storageFoundation.openSync('test_file');
+  testCase.add_cleanup(() => {
+     file.close();
+     storageFoundation.deleteSync('test_file');
+     storageFoundation.releaseCapacitySync(1);
+  });
+
+  const granted_capacity =  storageFoundation.requestCapacitySync(4);
+  assert_greater_than_equal(granted_capacity, 2);
+
+  const writtenBytes = new Uint8Array(granted_capacity - 1).fill(64);
+  file.write(writtenBytes, 0);
+}, 'write() succeeds when given a buffer of length granted capacity - 1');
+
+test(testCase => {
+  const file =  storageFoundation.openSync('test_file');
+
+  const granted_capacity =  storageFoundation.requestCapacitySync(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(() => {
+     file.close();
+     storageFoundation.deleteSync('test_file');
+     storageFoundation.releaseCapacitySync(granted_capacity);
+  });
+  const writtenBytes = new Uint8Array(granted_capacity).fill(64);
+
+  file.write(writtenBytes, 0);
+}, 'write() succeeds when given the granted capacity');
+
+test(testCase => {
+  const file =  storageFoundation.openSync('test_file');
+
+  const granted_capacity =  storageFoundation.requestCapacitySync(4);
+  assert_greater_than_equal(granted_capacity, 2);
+  testCase.add_cleanup(() => {
+     file.close();
+     storageFoundation.deleteSync('test_file');
+     storageFoundation.releaseCapacitySync(granted_capacity);
+  });
+  const writtenBytes = new Uint8Array(granted_capacity + 1).fill(64);
+
+  assert_throws_dom('QuotaExceededError', () => {file.write(writtenBytes, 0)});
+}, 'write() fails when given the granted capacity + 1');
diff --git a/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js
index 5fb48acb42f..428d63ebd57 100644
--- a/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/write_getLength_async_basic.tentative.https.any.js
@@ -1,22 +1,13 @@
 // META: title=Synchronous NativeIO API: getLength reports written bytes.
 // META: global=window,worker
+// META: script=resources/support.js
 
 'use strict';
 
 promise_test(async testCase => {
-  const file = await storageFoundation.open('test_file');
-  testCase.add_cleanup(async () => {
-    await file.close();
-    await storageFoundation.delete('test_file');
-  });
+  await reserveAndCleanupCapacity(testCase);
 
-  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
-  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
-  writtenBytes.set([64, 65, 66, 67]);
-  const writeCount = await file.write(writtenBytes, 0);
-  assert_equals(
-      writeCount, 4,
-      'NativeIOFile.write() should resolve with the number of bytes written');
+  const file = await createFile(testCase, 'test_file', [64, 65, 66, 67]);
 
   const length = await file.getLength();
   assert_equals(length, 4,
diff --git a/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js
index 72b70fa69cd..09e97fe6fe9 100644
--- a/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/write_getLength_sync_basic.tentative.https.any.js
@@ -1,25 +1,17 @@
 // META: title=Synchronous NativeIO API: getLength reports written bytes.
 // META: global=dedicatedworker
+// META: script=resources/support.js
 
 'use strict';
 
 test(testCase => {
-  const file = storageFoundation.openSync('test_file');
-  testCase.add_cleanup(() => {
-    file.close();
-    storageFoundation.deleteSync('test_file');
-  });
+  reserveAndCleanupCapacitySync(testCase);
 
-  const writtenBytes = Uint8Array.from([64, 65, 66, 67]);
-  const writeCount = file.write(writtenBytes, 0);
-  assert_equals(
-      writeCount, 4,
-      'NativeIOFileSync.write() should resolve with the number of bytes' +
-      'written.');
+  const file = createFileSync(testCase, 'test_file', [64, 65, 66, 67]);
 
   const length = file.getLength();
   assert_equals(length, 4,
-                'NativeIOFileSync.getLength() should return the number of' +
-                ' bytes in the file.');
+    'NativeIOFileSync.getLength() should return the number of' +
+    ' bytes in the file.');
 }, 'NativeIOFileSync.getLength returns the number bytes written by' +
-    ' NativeIOFileSync.write');
+' NativeIOFileSync.write');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html
index 4c79670de37..5e56fe248c9 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event.https.html
@@ -501,7 +501,7 @@ promise_test(async t => {
     const echo_url = '/fetch/api/resources/echo-content.py?ignore';
     const response = await frame.contentWindow.fetch(echo_url, {
         method: 'POST',
-        body: rs
+        body: rs.pipeThrough(new TextEncoderStream())
     });
     const text = await response.text();
     assert_equals(text,
@@ -550,9 +550,10 @@ promise_test(async t => {
     const frame = await with_iframe(page_url);
     t.add_cleanup(() => { frame.remove(); });
     const echo_url = '/fetch/api/resources/echo-content.py?use-and-ignore';
-    await promise_rejects_js(t, TypeError, frame.contentWindow.fetch(echo_url, {
+    const w = frame.contentWindow;
+    await promise_rejects_js(t, w.TypeError, w.fetch(echo_url, {
         method: 'POST',
-        body: rs
+        body: rs.pipeThrough(new TextEncoderStream())
     }));
   }, 'FetchEvent#body is a ReadableStream, used and passed to network fallback');
 
diff --git a/tests/wpt/web-platform-tests/shadow-dom/event-on-pseudo-element-crash.html b/tests/wpt/web-platform-tests/shadow-dom/event-on-pseudo-element-crash.html
new file mode 100644
index 00000000000..56674b6cdc6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/event-on-pseudo-element-crash.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel="help" href="https://crbug.com/1180286">
+<meta name="assert" content="The renderer should not crash.">
+
+<span>This test passes if the renderer does not crash.</span>
+
+<div>
+  <option></option>
+</div>
+
+<style>
+  div {
+    direction: rtl;
+    zoom: 0.01;
+  }
+  option {
+    zoom: 5;
+  }
+  option::before {
+    display: table-caption;
+    overflow: scroll;
+    content: open-quote;
+    padding-right: 1px;
+    -webkit-column-width: 1px;
+  }
+</style>
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
index 046b336cbdc..e39be996d99 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
@@ -1,10 +1,10 @@
 cask "safari-technology-preview" do
   if MacOS.version <= :catalina
-    version "120,071-05417-20210210-20164467-7abe-4a43-900d-233abd8aa93e"
-    sha256 "b0f923815a524baf6a58dfd7786f9965a4d78954dcfe2eed27eda6a21b9e01df"
+    version "121,071-09120-20210225-f4746953-9d4f-4b3f-8c6d-cf3abca5a427"
+    sha256 "d7548d42dd73c01a61fb612624db79517bb595ce4e5296758d52a12a305114c8"
   else
-    version "120,071-05422-20210210-6651b9d4-a687-4e72-922b-76e7809f1aa7"
-    sha256 "aee083fb1e0e956f27017be505a6d835fdb767ac14470e263ab8782452b92db0"
+    version "121,071-09105-20210225-0b576a94-c7cd-43cb-9df2-6e08176fc45a"
+    sha256 "a5fae01d4b5ccca9952baccc0a52791e3366da8ee1ca470dc1e7554ea6b0e87c"
   end
 
   url "https://secure-appldnld.apple.com/STP/#{version.after_comma}/SafariTechnologyPreview.dmg"
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index 68ba04e1a68..b47d0ad26f9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -286,9 +286,9 @@ class TestExecutor(object):
         """Run a particular test.
 
         :param test: The test to run"""
-        if test.environment != self.last_environment:
-            self.on_environment_change(test.environment)
         try:
+            if test.environment != self.last_environment:
+                self.on_environment_change(test.environment)
             result = self.do_test(test)
         except Exception as e:
             exception_string = traceback.format_exc()
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 81be731b06d..ea4cbe12b24 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -633,15 +633,28 @@ class MarionetteDebugProtocolPart(DebugProtocolPart):
     def load_devtools(self):
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             self.parent.base.execute_script("""
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
-const { TargetFactory } = require("devtools/client/framework/target");
-const { gDevTools } = require("devtools/client/framework/devtools");
+const DevToolsShim = ChromeUtils.import(
+  "chrome://devtools-startup/content/DevToolsShim.jsm"
+);
 
 const callback = arguments[arguments.length - 1];
 
 async function loadDevTools() {
-    const target = await TargetFactory.forTab(window.gBrowser.selectedTab);
-    await gDevTools.showToolbox(target, "webconsole", "window");
+    const tab = window.gBrowser.selectedTab;
+    // showToolboxForTab is available for Firefox 87 or newer.
+    if (typeof DevToolsShim.showToolboxForTab === "function") {
+        await showToolboxForTab(tab, {
+          toolId: "webconsole",
+          hostType: "window"
+        });
+    } else {
+        // This branch can be removed whe wptrunner can only be used with
+        // Firefox 87 or newer.
+        const { TargetFactory } = require("devtools/client/framework/target");
+        const { gDevTools } = require("devtools/client/framework/devtools");
+        const target = await TargetFactory.forTab(tab);
+        await gDevTools.showToolbox(target, "webconsole", "window");
+    }
 }
 
 loadDevTools().catch(() => dump("Devtools failed to load"))
diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js b/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js
index 4656ff03101..0a8b39c9204 100644
--- a/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js
+++ b/tests/wpt/web-platform-tests/webcodecs/audio-encoder.any.js
@@ -108,6 +108,87 @@ promise_test(async t => {
 }, 'Simple audio encoding');
 
 
+async function checkEncodingError(config, good_frames, bad_frame) {
+  let error = null;
+  let outputs = 0;
+  let init = {
+    error: e => {
+      error = e;
+    },
+    output: chunk => {
+      outputs++;
+    }
+  };
+
+  let encoder = new AudioEncoder(init);
+
+  encoder.configure(config);
+  for (let frame of good_frames) {
+    encoder.encode(frame);
+  }
+  await encoder.flush();
+
+  let txt_config = "sampleRate: " + config.sampleRate
+                 + " numberOfChannels: " + config.numberOfChannels;
+  assert_equals(error, null, txt_config);
+  assert_greater_than(outputs, 0);
+  encoder.encode(bad_frame);
+  await encoder.flush().catch(() => {});
+  assert_not_equals(error, null, txt_config);
+}
+
+function channelNumberVariationTests() {
+  let sample_rate = 48000;
+  for (let channels = 1; channels < 12; channels++) {
+    let config = {
+      codec: 'opus',
+      sampleRate: sample_rate,
+      numberOfChannels: channels,
+      bitrate: 128000
+    };
+
+    let ts = 0;
+    let length = sample_rate / 10;
+    let frame1 = make_audio_frame(ts, channels, sample_rate, length);
+
+    ts += Math.floor(frame1.buffer.duration / 1000000);
+    let frame2 = make_audio_frame(ts, channels, sample_rate, length);
+    ts += Math.floor(frame2.buffer.duration / 1000000);
+
+    let bad_frame = make_audio_frame(ts, channels + 1, sample_rate, length);
+    promise_test(async t =>
+      checkEncodingError(config, [frame1, frame2], bad_frame),
+      "Channel number variation: " + channels);
+  }
+}
+channelNumberVariationTests();
+
+function sampleRateVariationTests() {
+  let channels = 1
+  for (let sample_rate = 3000; sample_rate < 96000; sample_rate += 10000) {
+    let config = {
+      codec: 'opus',
+      sampleRate: sample_rate,
+      numberOfChannels: channels,
+      bitrate: 128000
+    };
+
+    let ts = 0;
+    let length = sample_rate / 10;
+    let frame1 = make_audio_frame(ts, channels, sample_rate, length);
+
+    ts += Math.floor(frame1.buffer.duration / 1000000);
+    let frame2 = make_audio_frame(ts, channels, sample_rate, length);
+    ts += Math.floor(frame2.buffer.duration / 1000000);
+
+    let bad_frame = make_audio_frame(ts, channels, sample_rate + 333, length);
+    promise_test(async t =>
+      checkEncodingError(config, [frame1, frame2], bad_frame),
+      "Sample rate variation: " + sample_rate);
+  }
+}
+sampleRateVariationTests();
+
 promise_test(async t => {
   let sample_rate = 48000;
   let total_duration_s = 2;
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-frame-from-video.html b/tests/wpt/web-platform-tests/webcodecs/video-frame-from-video.html
new file mode 100644
index 00000000000..80c24cf6337
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/video-frame-from-video.html
@@ -0,0 +1,38 @@
+<title>Test VideoFrame creation from a video element.</title>
+<video preload="auto"></video>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test(t => {
+  let video = document.querySelector('video');
+  video.onerror = t.unreached_func();
+  video.requestVideoFrameCallback(_ => {
+    let frame = new VideoFrame(video);
+    assert_true(!!frame);
+
+    let frame_copy = new VideoFrame(frame, {duration: 1234});
+    assert_equals(frame.timestamp, frame_copy.timestamp);
+    assert_equals(frame_copy.duration, 1234);
+    frame_copy.close();
+
+    frame_copy = new VideoFrame(frame, {timestamp: 1234, duration: 456});
+    assert_equals(frame_copy.timestamp, 1234);
+    assert_equals(frame_copy.duration, 456);
+    frame_copy.close();
+
+    frame_copy = new VideoFrame(frame);
+    assert_equals(frame.format, frame_copy.format);
+    assert_equals(frame.timestamp, frame_copy.timestamp);
+    assert_equals(frame.codedWidth, frame_copy.codedWidth);
+    assert_equals(frame.codedHeight, frame_copy.codedHeight);
+    assert_equals(frame.displayWidth, frame_copy.displayWidth);
+    assert_equals(frame.displayHeight, frame_copy.displayHeight);
+    assert_equals(frame.duration, frame_copy.duration);
+    frame_copy.close();
+
+    frame.close();
+    t.done();
+  });
+  video.src = 'vp9.mp4';
+}, 'Test <video> and VideoFrame constructed VideoFrame');
+</script>
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js b/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js
index 3ae10f829a0..71a73c4ee34 100644
--- a/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js
+++ b/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js
@@ -418,3 +418,31 @@ test(t => {
     }, fmt + ': plane size too small');
   });
 }, 'Test planar constructed RGB VideoFrames');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 0});
+  assert_true(!!frame);
+
+  frame_copy = new VideoFrame(frame);
+  assert_equals(frame.format, frame_copy.format);
+  assert_equals(frame.timestamp, frame_copy.timestamp);
+  assert_equals(frame.codedWidth, frame_copy.codedWidth);
+  assert_equals(frame.codedHeight, frame_copy.codedHeight);
+  assert_equals(frame.displayWidth, frame_copy.displayWidth);
+  assert_equals(frame.displayHeight, frame_copy.displayHeight);
+  assert_equals(frame.duration, frame_copy.duration);
+  frame_copy.close();
+
+  frame_copy = new VideoFrame(frame, {duration: 1234});
+  assert_equals(frame.timestamp, frame_copy.timestamp);
+  assert_equals(frame_copy.duration, 1234);
+  frame_copy.close();
+
+  frame_copy = new VideoFrame(frame, {timestamp: 1234, duration: 456});
+  assert_equals(frame_copy.timestamp, 1234);
+  assert_equals(frame_copy.duration, 456);
+  frame_copy.close();
+
+  frame.close();
+}, 'Test VideoFrame constructed VideoFrame');
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/new_session/connect.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/new_session/connect.py
index 283853562df..2b02d8ae99d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/new_session/connect.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/new_session/connect.py
@@ -1,43 +1,35 @@
 import pytest
 import asyncio
 import websockets
+import webdriver
 
 # classic session to enable bidi capability manually
+# Intended to be the first test in this file
 @pytest.mark.asyncio
 @pytest.mark.capabilities({"webSocketUrl": True})
 async def test_websocket_url_connect(session):
+    assert not isinstance(session, webdriver.BidiSession)
     websocket_url = session.capabilities["webSocketUrl"]
     async with websockets.connect(websocket_url) as websocket:
         await websocket.send("Hello world!")
-        await websocket.close()
 
-# bidi session following classic session to test session
-# recreation with bidi true in session fixture.
-# Close websocket at the end.
+# test bidi_session send
+# using bidi_session is the recommended way to test bidi
 @pytest.mark.asyncio
-@pytest.mark.bidi(True)
-async def test_bidi_session_1(session):
-    await session.websocket_transport.send("test_bidi_session_1")
-    await session.websocket_transport.close()
-
-# bidi session following a bidi session with the same capabilities
-# but closed websocket to test restart of websocket connection.
-@pytest.mark.asyncio
-@pytest.mark.bidi(True)
-async def test_bidi_session_2(session):
-    await session.websocket_transport.send("test_bidi_session_2")
-    await session.websocket_transport.close()
+async def test_bidi_session_send(bidi_session):
+    await bidi_session.websocket_transport.send("test_bidi_session: send")
 
 # bidi session following a bidi session with a different capabilities
 # to test session recreation
 @pytest.mark.asyncio
-@pytest.mark.bidi(True)
 @pytest.mark.capabilities({"acceptInsecureCerts": True})
-async def test_bidi_session_3(session):
-    await session.websocket_transport.send("test_bidi_session_3")
+async def test_bidi_session_with_different_capability(bidi_session):
+    await bidi_session.websocket_transport.send("test_bidi_session: different capability")
 
 # classic session following a bidi session to test session
 # recreation
+# Intended to be the last test in this file to make sure
+# classic session is not impacted by bidi tests
 @pytest.mark.asyncio
-async def test_classic(session):
-    pass
+def test_classic_after_bidi_session(session):
+    assert not isinstance(session, webdriver.BidiSession)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
index a1cd99a5540..7cb91ca62c2 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -25,8 +25,6 @@ def pytest_configure(config):
     # register the capabilities marker
     config.addinivalue_line("markers",
         "capabilities: mark test to use capabilities")
-    config.addinivalue_line("markers",
-        "bidi: mark test to use bidi")
 
 
 @pytest.fixture
@@ -41,10 +39,6 @@ def pytest_generate_tests(metafunc):
         if marker:
             metafunc.parametrize("capabilities", marker.args, ids=None)
 
-    if "bidi" in metafunc.fixturenames:
-        marker = metafunc.definition.get_closest_marker(name="bidi")
-        if marker:
-            metafunc.parametrize("bidi", marker.args, ids=None)
 
 # Ensure that the event loop is restarted once per session rather than the default  of once per test
 # if we don't do this, tests will try to reuse a closed event loop and fail with an error that the "future
@@ -56,6 +50,7 @@ def event_loop():
     yield loop
     loop.close()
 
+
 @pytest.fixture
 def add_event_listeners(session):
     """Register listeners for tracked events on element."""
@@ -127,12 +122,9 @@ def configuration():
         "capabilities": capabilities
     }
 
-@pytest.fixture(scope="session")
-def bidi():
-    return False
 
 @pytest.fixture(scope="function")
-async def session(capabilities, configuration, request, bidi):
+async def session(capabilities, configuration, request):
     """Create and start a session for a test that does not itself test session creation.
 
     By default the session will stay open after each test, but we always try to start a
@@ -150,31 +142,69 @@ async def session(capabilities, configuration, request, bidi):
     is_cur_bidi = isinstance(_current_session, webdriver.BidiSession)
     # If there is a session with different capabilities active or the current session
     # is of different type than the one we would like to create, end it now.
-    if _current_session is not None and (
-            (not _current_session.match(caps)) or
-            (is_cur_bidi != bidi)):
-        if is_cur_bidi:
-            await _current_session.end()
-        else:
-            _current_session.end()
-        _current_session = None
+    if _current_session is not None:
+        is_bidi = isinstance(_current_session, webdriver.BidiSession)
+        if is_bidi or caps != _current_session.requested_capabilities:
+            if is_bidi:
+                await _current_session.end()
+            else:
+                _current_session.end()
+            _current_session = None
 
     if _current_session is None:
-        if bidi:
-            _current_session = webdriver.BidiSession(
-                configuration["host"],
-                configuration["port"],
-                capabilities=caps)
-        else:
-            _current_session = webdriver.Session(
-                configuration["host"],
-                configuration["port"],
-                capabilities=caps)
+        _current_session = webdriver.Session(
+            configuration["host"],
+            configuration["port"],
+            capabilities=caps)
     try:
-        if type(_current_session) == webdriver.BidiSession:
-            await _current_session.start()
-        else:
-            _current_session.start()
+        _current_session.start()
+
+    except webdriver.error.SessionNotCreatedException:
+        if not _current_session.session_id:
+            raise
+
+    # Enforce a fixed default window size and position
+    _current_session.window.size = defaults.WINDOW_SIZE
+    _current_session.window.position = defaults.WINDOW_POSITION
+
+    yield _current_session
+
+    cleanup_session(_current_session)
+
+
+@pytest.fixture(scope="function")
+async def bidi_session(capabilities, configuration, request):
+    """Create and start a bidi session for a test that does not itself test
+    bidi session creation.
+    By default the session will stay open after each test, but we always try to start a
+    new one and assume that if that fails there is already a valid session. This makes it
+    possible to recover from some errors that might leave the session in a bad state, but
+    does not demand that we start a new session per test."""
+    global _current_session
+
+    # Update configuration capabilities with custom ones from the
+    # capabilities fixture, which can be set by tests
+    caps = copy.deepcopy(configuration["capabilities"])
+    deep_update(caps, capabilities)
+    caps = {"alwaysMatch": caps}
+
+    if _current_session is not None:
+        is_bidi = isinstance(_current_session, webdriver.BidiSession)
+        if not is_bidi or not _current_session.match(caps):
+            if is_bidi:
+                await _current_session.end()
+            else:
+                _current_session.end()
+            _current_session = None
+
+    if _current_session is None:
+        _current_session = webdriver.BidiSession(
+            configuration["host"],
+            configuration["port"],
+            capabilities=caps)
+
+    try:
+        await _current_session.start()
 
     except webdriver.error.SessionNotCreatedException:
         if not _current_session.session_id: