Bug 1766274 - Part 1: Rename ProcessFetchedModuleSource to OnFetchComplete and pass an error code r=yulia

This renames the method to correspond to StartFetch and adds a status argument
so clients can call this rather than
SetModuleFetchFinishedAndResumeWaitingRequests on error.

Depends on D144595

Differential Revision: https://phabricator.services.mozilla.com/D144596
This commit is contained in:
Jon Coppeard
2022-04-26 12:40:47 +00:00
parent 81431f4197
commit be040930d2
4 changed files with 27 additions and 24 deletions

View File

@@ -428,24 +428,27 @@ ModuleScript* ModuleLoaderBase::GetFetchedModule(nsIURI* aURL) const {
return ms;
}
nsresult ModuleLoaderBase::ProcessFetchedModuleSource(
ModuleLoadRequest* aRequest) {
nsresult ModuleLoaderBase::OnFetchComplete(ModuleLoadRequest* aRequest,
nsresult aRv) {
MOZ_ASSERT(aRequest->mLoader == this);
MOZ_ASSERT(!aRequest->mModuleScript);
nsresult rv = CreateModuleScript(aRequest);
MOZ_ASSERT(NS_FAILED(rv) == !aRequest->mModuleScript);
nsresult rv = aRv;
if (NS_SUCCEEDED(rv)) {
rv = CreateModuleScript(aRequest);
aRequest->ClearScriptSource();
aRequest->ClearScriptSource();
if (NS_FAILED(rv)) {
aRequest->LoadFailed();
return rv;
if (NS_FAILED(rv)) {
aRequest->LoadFailed();
return rv;
}
}
MOZ_ASSERT(NS_SUCCEEDED(rv) == bool(aRequest->mModuleScript));
SetModuleFetchFinishedAndResumeWaitingRequests(aRequest, rv);
if (!aRequest->mModuleScript->HasParseError()) {
if (aRequest->mModuleScript && !aRequest->mModuleScript->HasParseError()) {
StartFetchingModuleDependencies(aRequest);
}