Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 09:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1745626 - Dynamic import should always try to unblock onload event in DOM context; r=jonco

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D133629
This commit is contained in:
Yulia Startsev 2021-12-14 10:53:58 +00:00
parent bfbe9b27fe
commit 8e87e45a45
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/script/ModuleLoader.cpp
View File

@ -640,14 +640,7 @@ ModuleLoader::~ModuleLoader() {
void ModuleLoader::ProcessLoadedModuleTree(ModuleLoadRequest* aRequest) {
MOZ_ASSERT(aRequest->IsReadyToRun());
if (aRequest->IsDynamicImport()) {
MOZ_ASSERT(aRequest->isInList());
RefPtr<ScriptLoadRequest> req = mDynamicImportRequests.Steal(aRequest);
mLoader->RunScriptWhenSafe(aRequest);
} else {
mLoader->ProcessLoadedModuleTree(aRequest);
}
mLoader->ProcessLoadedModuleTree(aRequest);
}
JS::Value ModuleLoader::FindFirstParseError(ModuleLoadRequest* aRequest) {

9
dom/script/ScriptLoader.cpp
View File

@ -753,8 +753,13 @@ void ScriptLoader::ProcessLoadedModuleTree(ModuleLoadRequest* aRequest) {
MOZ_ASSERT(aRequest->IsReadyToRun());
if (aRequest->IsTopLevel()) {
if (aRequest->mIsInline &&
aRequest->GetParserCreated() == NOT_FROM_PARSER) {
if (aRequest->IsDynamicImport()) {
MOZ_ASSERT(aRequest->isInList());
RefPtr<ScriptLoadRequest> req =
mModuleLoader->mDynamicImportRequests.Steal(aRequest);
RunScriptWhenSafe(aRequest);
} else if (aRequest->mIsInline &&
aRequest->GetParserCreated() == NOT_FROM_PARSER) {
MOZ_ASSERT(!aRequest->isInList());
RunScriptWhenSafe(aRequest);
} else {