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

Backed out changeset f69f493b2f3c (bug 1800641) for causing non-unified build bustages on LoadedScript.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Cosmin Sabou
2023-12-25 08:38:51 +02:00
parent d60b4bd3b1
commit 78d82c8098
20 changed files with 361 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/loader/ModuleLoaderBase.cpp
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;
}