Bug 1877792 - Part 9: Add module type to ModuleLoaderBase::{CreateStaticImport,CreateDynamicImport} r=spidermonkey-reviewers,dom-worker-reviewers,dom-core,asuth,jonco,mccr8

This patch adds a module type parameter to
`ModuleLoaderBase::{CreateStaticImport,CreateDynamicImport},` and gets rid of a
bunch of hard-coded `JS::ModuleType::JavaScript.` However, the module type is
still hard-coded when we call `CreateDynamicImport` and `CreateStaticImport`.

Differential Revision: https://phabricator.services.mozilla.com/D218556
This commit is contained in:
Jonatan Klemets
2024-08-22 14:21:51 +00:00
parent 1d65cffc8b
commit df3d32caa7
10 changed files with 60 additions and 58 deletions

View File

@@ -332,8 +332,8 @@ bool ModuleLoaderBase::HostImportModuleDynamically(
// Create a new top-level load request.
nsCOMPtr<nsIURI> uri = result.unwrap();
RefPtr<ModuleLoadRequest> request =
loader->CreateDynamicImport(aCx, uri, script, specifierString, aPromise);
RefPtr<ModuleLoadRequest> request = loader->CreateDynamicImport(
aCx, uri, JS::ModuleType::JavaScript, script, specifierString, aPromise);
if (!request) {
// Throws TypeError if CreateDynamicImport returns nullptr.
@@ -917,8 +917,8 @@ void ModuleLoaderBase::StartFetchingModuleDependencies(
void ModuleLoaderBase::StartFetchingModuleAndDependencies(
ModuleLoadRequest* aParent, const ModuleMapKey& aRequestedModule) {
RefPtr<ModuleLoadRequest> childRequest =
CreateStaticImport(aRequestedModule.mUri, aParent);
RefPtr<ModuleLoadRequest> childRequest = CreateStaticImport(
aRequestedModule.mUri, aRequestedModule.mModuleType, aParent);
aParent->mImports.AppendElement(childRequest);