corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1742437 - move DOM script context into own file and rename it; r=jonco

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D138132
This commit is contained in:
Yulia Startsev
2022-02-17 15:57:51 +00:00
parent fce4457549
commit e92cc07dad
10 changed files with 495 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dom/script/ModuleLoader.cpp
View File

@@ -257,13 +257,13 @@ bool HostImportModuleDynamically(JSContext* aCx,
RefPtr<ScriptFetchOptions> options;
nsIURI* baseURL = nullptr;
nsCOMPtr<Element> element;
RefPtr<DOMScriptLoadContext> context;
RefPtr<ScriptLoadContext> context;
// This will be null in all cases except WebExtensions.
if (script) {
options = script->GetFetchOptions();
baseURL = script->BaseURL();
nsCOMPtr<Element> element = script->GetScriptElement();
context = new DOMScriptLoadContext(element);
context = new ScriptLoadContext(element);
} else {
// We don't have a referencing script so fall back on using
// options from the document. This can happen when the user
@@ -288,7 +288,7 @@ bool HostImportModuleDynamically(JSContext* aCx,
options = new ScriptFetchOptions(mozilla::CORS_NONE,
document->GetReferrerPolicy(), principal);
baseURL = document->GetDocBaseURI();
context = new DOMScriptLoadContext(nullptr, global);
context = new ScriptLoadContext(nullptr, global);
}
RefPtr<ModuleLoadRequest> request = ModuleLoader::CreateDynamicImport(
@@ -473,7 +473,7 @@ nsresult ModuleLoader::CompileOrFinishModuleScript(
already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateTopLevel(
nsIURI* aURI, ScriptFetchOptions* aFetchOptions,
const SRIMetadata& aIntegrity, nsIURI* aReferrer, ScriptLoader* aLoader,
DOMScriptLoadContext* aContext) {
ScriptLoadContext* aContext) {
RefPtr<ModuleLoadRequest> request = new ModuleLoadRequest(
aURI, aFetchOptions, aIntegrity, aReferrer, aContext, true,
/* is top level */ false, /* is dynamic import */
@@ -486,9 +486,9 @@ already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateTopLevel(
/* static */
already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateStaticImport(
nsIURI* aURI, ModuleLoadRequest* aParent) {
RefPtr<DOMScriptLoadContext> newContext =
new DOMScriptLoadContext(aParent->GetLoadContext()->mElement,
aParent->GetLoadContext()->mWebExtGlobal);
RefPtr<ScriptLoadContext> newContext =
new ScriptLoadContext(aParent->GetLoadContext()->mElement,
aParent->GetLoadContext()->mWebExtGlobal);
newContext->mIsInline = false;
// Propagated Parent values. TODO: allow child modules to use root module's
// script mode.
@@ -506,14 +506,14 @@ already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateStaticImport(
/* static */
already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateDynamicImport(
nsIURI* aURI, ScriptFetchOptions* aFetchOptions, nsIURI* aBaseURL,
DOMScriptLoadContext* aContext, ScriptLoader* aLoader,
ScriptLoadContext* aContext, ScriptLoader* aLoader,
JS::Handle<JS::Value> aReferencingPrivate, JS::Handle<JSString*> aSpecifier,
JS::Handle<JSObject*> aPromise) {
MOZ_ASSERT(aSpecifier);
MOZ_ASSERT(aPromise);
aContext->mIsInline = false;
aContext->mScriptMode = DOMScriptLoadContext::ScriptMode::eAsync;
aContext->mScriptMode = ScriptLoadContext::ScriptMode::eAsync;
RefPtr<ModuleLoadRequest> request = new ModuleLoadRequest(
aURI, aFetchOptions, SRIMetadata(), aBaseURL, aContext, true,