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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

15
dom/script/ScriptLoader.cpp
View File

@@ -1150,7 +1150,9 @@ bool ScriptLoader::ProcessInlineScript(nsIScriptElement* aElement,
mozilla::nsAutoMicroTask mt;
}
nsresult rv = modReq->ProcessFetchedModuleSource();
// This calls OnFetchComplete directly since there's no need to start
// fetching an inline script.
nsresult rv = modReq->OnFetchComplete(NS_OK);
if (NS_FAILED(rv)) {
ReportErrorToConsole(modReq, rv);
HandleLoadError(modReq, rv);
@@ -1385,7 +1387,7 @@ nsresult ScriptLoader::ProcessOffThreadRequest(ScriptLoadRequest* aRequest) {
if (aRequest->IsModuleRequest()) {
MOZ_ASSERT(aRequest->GetScriptLoadContext()->mOffThreadToken);
ModuleLoadRequest* request = aRequest->AsModuleRequest();
return request->ProcessFetchedModuleSource();
return request->OnFetchComplete(NS_OK);
}
// Element may not be ready yet if speculatively compiling, so process the
@@ -3015,10 +3017,9 @@ void ScriptLoader::HandleLoadError(ScriptLoadRequest* aRequest,
mDocument->AddBlockedNodeByClassifier(cont);
}
if (aRequest->IsModuleRequest() &&
!aRequest->GetScriptLoadContext()->mIsInline) {
auto* request = aRequest->AsModuleRequest();
request->SetModuleFetchFinishedAndResumeWaitingRequests(aResult);
if (aRequest->IsModuleRequest()) {
MOZ_ASSERT(!aRequest->GetScriptLoadContext()->mIsInline);
aRequest->AsModuleRequest()->OnFetchComplete(aResult);
}
if (aRequest->GetScriptLoadContext()->mInDeferList) {
@@ -3343,7 +3344,7 @@ nsresult ScriptLoader::PrepareLoadedRequest(ScriptLoadRequest* aRequest,
}
// Otherwise compile it right away and start fetching descendents.
return request->ProcessFetchedModuleSource();
return request->OnFetchComplete(NS_OK);
}
// The script is now loaded and ready to run.