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

Bug Bug 1388728 - Update module loader error handling to match the spec r=bkelly

Browse Source
This commit is contained in:
Jon Coppeard
2017-08-22 10:34:14 +01:00
parent 115b44dacc
commit b2b2e9e171
6 changed files with 330 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dom/script/ModuleLoadRequest.cpp
View File

@@ -48,10 +48,16 @@ ModuleLoadRequest::Cancel()
ScriptLoadRequest::Cancel();
mModuleScript = nullptr;
mProgress = ScriptLoadRequest::Progress::Ready;
CancelImports();
mReady.RejectIfExists(NS_ERROR_DOM_ABORT_ERR, __func__);
}
void
ModuleLoadRequest::CancelImports()
{
for (size_t i = 0; i < mImports.Length(); i++) {
mImports[i]->Cancel();
}
mReady.RejectIfExists(NS_ERROR_FAILURE, __func__);
}
void
@@ -84,9 +90,27 @@ ModuleLoadRequest::ModuleLoaded()
LOG(("ScriptLoadRequest (%p): Module loaded", this));
mModuleScript = mLoader->GetFetchedModule(mURI);
if (!mModuleScript || mModuleScript->IsErrored()) {
ModuleErrored();
return;
}
mLoader->StartFetchingModuleDependencies(this);
}
void
ModuleLoadRequest::ModuleErrored()
{
LOG(("ScriptLoadRequest (%p): Module errored", this));
mLoader->CheckModuleDependenciesLoaded(this);
MOZ_ASSERT(!mModuleScript || mModuleScript->IsErrored());
CancelImports();
SetReady();
LoadFinished();
}
void
ModuleLoadRequest::DependenciesLoaded()
{
@@ -95,19 +119,32 @@ ModuleLoadRequest::DependenciesLoaded()
LOG(("ScriptLoadRequest (%p): Module dependencies loaded", this));
MOZ_ASSERT(mModuleScript);
mLoader->CheckModuleDependenciesLoaded(this);
SetReady();
mLoader->ProcessLoadedModuleTree(this);
mLoader = nullptr;
mParent = nullptr;
LoadFinished();
}
void
ModuleLoadRequest::LoadFailed()
{
// We failed to load the source text or an error occurred unrelated to the
// content of the module (e.g. OOM).
LOG(("ScriptLoadRequest (%p): Module load failed", this));
MOZ_ASSERT(!mModuleScript);
Cancel();
LoadFinished();
}
void
ModuleLoadRequest::LoadFinished()
{
mLoader->ProcessLoadedModuleTree(this);
mLoader = nullptr;
mParent = nullptr;
}