Backed out changeset 4d6294424819 (bug 1800641) for causing Bug 1872347

This commit is contained in:
Noemi Erli
2023-12-29 16:23:18 +02:00
parent a5e5ace289
commit 46e817bca8
20 changed files with 362 additions and 620 deletions

View File

@@ -638,13 +638,9 @@ nsresult ModuleLoaderBase::CreateModuleScript(ModuleLoadRequest* aRequest) {
}
}
MOZ_ASSERT(aRequest->mLoadedScript->IsModuleScript());
MOZ_ASSERT(aRequest->mLoadedScript->GetFetchOptions() ==
aRequest->mFetchOptions);
MOZ_ASSERT(aRequest->mLoadedScript->GetURI() == aRequest->mURI);
aRequest->mLoadedScript->SetBaseURL(aRequest->mBaseURL);
RefPtr<ModuleScript> moduleScript =
aRequest->mLoadedScript->AsModuleScript();
new ModuleScript(aRequest->ReferrerPolicy(), aRequest->mFetchOptions,
aRequest->mBaseURL);
aRequest->mModuleScript = moduleScript;
if (!module) {
@@ -1353,8 +1349,7 @@ UniquePtr<ImportMap> ModuleLoaderBase::ParseImportMap(
MOZ_ASSERT(aRequest->IsTextSource());
MaybeSourceText maybeSource;
nsresult rv = aRequest->GetScriptSource(jsapi.cx(), &maybeSource,
aRequest->mLoadContext.get());
nsresult rv = aRequest->GetScriptSource(jsapi.cx(), &maybeSource);
if (NS_FAILED(rv)) {
return nullptr;
}