Commit c906513f authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

[WPT/common/security-features] Rename source context names

We'll name worker/worklet-related things across the tests
consistently, with worker/worklet prefixes.
This CL renames source context names.

Bug: 906850
Change-Id: I0f31cd65c43e4a0bbb51efd4ead141e84ac5b1e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1777110Reviewed-by: default avatarKenichi Ishibashi <bashi@chromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691914}
parent 0e08859f
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
from the outer-most to inner-most environment settings objects. from the outer-most to inner-most environment settings objects.
For example: For example:
[{sourceContextType: "srcdoc"}, {sourceContextType: "classic-worker"}] [{sourceContextType: "srcdoc"}, {sourceContextType: "worker-classic"}]
means that a subresource request is to be sent from means that a subresource request is to be sent from
a classic dedicated worker created from <iframe srcdoc> a classic dedicated worker created from <iframe srcdoc>
inside the top-level HTML document. inside the top-level HTML document.
...@@ -1059,19 +1059,19 @@ function invokeRequest(subresource, sourceContextList) { ...@@ -1059,19 +1059,19 @@ function invokeRequest(subresource, sourceContextList) {
"iframe": { // <iframe src="same-origin-URL"></iframe> "iframe": { // <iframe src="same-origin-URL"></iframe>
invoker: invokeFromIframe, invoker: invokeFromIframe,
}, },
"classic-worker": { "worker-classic": {
// Classic dedicated worker loaded from same-origin. // Classic dedicated worker loaded from same-origin.
invoker: invokeFromWorker.bind(undefined, false, {}), invoker: invokeFromWorker.bind(undefined, false, {}),
}, },
"classic-data-worker": { "worker-classic-data": {
// Classic dedicated worker loaded from data: URL. // Classic dedicated worker loaded from data: URL.
invoker: invokeFromWorker.bind(undefined, true, {}), invoker: invokeFromWorker.bind(undefined, true, {}),
}, },
"module-worker": { "worker-module": {
// Module dedicated worker loaded from same-origin. // Module dedicated worker loaded from same-origin.
invoker: invokeFromWorker.bind(undefined, false, {type: 'module'}), invoker: invokeFromWorker.bind(undefined, false, {type: 'module'}),
}, },
"module-data-worker": { "worker-module-data": {
// Module dedicated worker loaded from data: URL. // Module dedicated worker loaded from data: URL.
invoker: invokeFromWorker.bind(undefined, true, {type: 'module'}), invoker: invokeFromWorker.bind(undefined, true, {type: 'module'}),
}, },
......
...@@ -73,7 +73,7 @@ function MixedContentTestCase(scenario, description, sanityChecker) { ...@@ -73,7 +73,7 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
// We bridge this inconsistency here, and will later pass these information // We bridge this inconsistency here, and will later pass these information
// directly from the generated tests and remove this conversion here. // directly from the generated tests and remove this conversion here.
subresourceType = 'fetch-request'; subresourceType = 'fetch-request';
sourceContextList = [{sourceContextType: 'classic-data-worker'}]; sourceContextList = [{sourceContextType: 'worker-classic-data'}];
} }
const originTypeConversion = { const originTypeConversion = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment