Backed out 6 changesets (bug 1313937, bug 1843066, bug 1843002) for causing build bustages in ScriptLoadRequest.h. CLOSED TREE
Backed out changeset 84c2d1c04aa2 (bug 1313937) Backed out changeset 7cab9a1ea25f (bug 1313937) Backed out changeset affc7d1f130d (bug 1313937) Backed out changeset e13aacfe7944 (bug 1843066) Backed out changeset 21a9bee8f772 (bug 1843002) Backed out changeset d381b6365111 (bug 1843002)
This commit is contained in:
@@ -271,9 +271,6 @@ already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateDynamicImport(
|
||||
RefPtr<ScriptLoadContext> context = new ScriptLoadContext();
|
||||
|
||||
if (aMaybeActiveScript) {
|
||||
// https://html.spec.whatwg.org/multipage/webappapis.html#hostloadimportedmodule
|
||||
// Step 6.3. Set fetchOptions to the new descendant script fetch options for
|
||||
// referencingScript's fetch options.
|
||||
options = aMaybeActiveScript->GetFetchOptions();
|
||||
baseURL = aMaybeActiveScript->BaseURL();
|
||||
} else {
|
||||
@@ -288,19 +285,8 @@ already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateDynamicImport(
|
||||
BasePrincipal::Cast(principal)->ContentScriptAddonPolicy());
|
||||
MOZ_ASSERT_IF(GetKind() == Normal, principal == document->NodePrincipal());
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/webappapis.html#hostloadimportedmodule
|
||||
// Step 4. Let fetchOptions be the default classic script fetch options.
|
||||
//
|
||||
// https://html.spec.whatwg.org/multipage/webappapis.html#default-classic-script-fetch-options
|
||||
// The default classic script fetch options are a script fetch options whose
|
||||
// cryptographic nonce is the empty string, integrity metadata is the empty
|
||||
// string, parser metadata is "not-parser-inserted", credentials mode is
|
||||
// "same-origin", referrer policy is the empty string, and fetch priority is
|
||||
// "auto".
|
||||
options = new ScriptFetchOptions(
|
||||
mozilla::CORS_NONE, document->GetReferrerPolicy(),
|
||||
/* aNonce = */ u""_ns, ParserMetadata::NotParserInserted, principal,
|
||||
nullptr);
|
||||
mozilla::CORS_NONE, document->GetReferrerPolicy(), principal, nullptr);
|
||||
baseURL = document->GetDocBaseURI();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user