Bug 1365494 - Remove the call to AbstractThread::GetCurrent() in ScriptLoader.cpp. r?jonco
See
bug 1365483 for the rationale.
MozReview-Commit-ID: EDcJU48H9iX
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -628,18 +628,18 @@ ScriptLoader::StartFetchingModuleDepende
for (size_t i = 0; i < urls.Length(); i++) {
RefPtr<GenericPromise> childReady =
StartFetchingModuleAndDependencies(aRequest, urls[i]);
importsReady.AppendElement(childReady);
}
// Wait for all imports to become ready.
RefPtr<GenericPromise::AllPromiseType> allReady =
- GenericPromise::All(AbstractThread::GetCurrent(), importsReady);
- allReady->Then(AbstractThread::GetCurrent(), __func__, aRequest,
+ GenericPromise::All(AbstractThread::MainThread(), importsReady);
+ allReady->Then(AbstractThread::MainThread(), __func__, aRequest,
&ModuleLoadRequest::DependenciesLoaded,
&ModuleLoadRequest::LoadFailed);
}
RefPtr<GenericPromise>
ScriptLoader::StartFetchingModuleAndDependencies(ModuleLoadRequest* aRequest,
nsIURI* aURI)
{
@@ -851,17 +851,17 @@ ScriptLoader::StartLoad(ScriptLoadReques
}
if (aRequest->IsModuleRequest()) {
// Check whether the module has been fetched or is currently being fetched,
// and if so wait for it.
ModuleLoadRequest* request = aRequest->AsModuleRequest();
if (ModuleMapContainsModule(request)) {
WaitForModuleFetch(request)
- ->Then(AbstractThread::GetCurrent(), __func__, request,
+ ->Then(AbstractThread::MainThread(), __func__, request,
&ModuleLoadRequest::ModuleLoaded,
&ModuleLoadRequest::LoadFailed);
return NS_OK;
}
// Otherwise put the URL in the module map and mark it as fetching.
SetModuleFetchStarted(request);
}
@@ -2561,17 +2561,17 @@ ScriptLoader::OnStreamComplete(nsIIncrem
}
if (sriOk) {
rv = PrepareLoadedRequest(aRequest, aLoader, aChannelStatus);
}
if (NS_FAILED(rv)) {
if (sriOk && aRequest->mElement) {
-
+
uint32_t lineNo = aRequest->mElement->GetScriptLineNumber();
nsAutoString url;
if (aRequest->mURI) {
AppendUTF8toUTF16(aRequest->mURI->GetSpecOrDefault(), url);
}
const char16_t* params[] = { url.get() };