From de7ebaa571748137ecc0226ac006d87eab904b15 Mon Sep 17 00:00:00 2001 From: Butkovits Atila Date: Fri, 16 Jul 2021 20:15:54 +0300 Subject: [PATCH] Backed out changeset fbb89c5b851b (bug 1720692) for casuing bustages complaining about 'CommandContext'. --- dom/script/ScriptLoader.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index 3a7a3d2bb9f2..9e33231e8cac 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -1950,13 +1950,6 @@ bool ScriptLoader::ProcessExternalScript(nsIScriptElement* aElement, request->SetScriptMode(aElement->GetScriptDeferred(), aElement->GetScriptAsync(), false); - // The request will be added to another list or set as - // mParserBlockingRequest below. - if (request->mInCompilingList) { - mOffThreadCompilingRequests.Remove(request); - request->mInCompilingList = false; - } - AccumulateCategorical(LABELS_DOM_SCRIPT_PRELOAD_RESULT::Used); } else { // No usable preload found. @@ -4432,7 +4425,11 @@ void ScriptLoader::PreloadURI(nsIURI* aURI, const nsAString& aCharset, void ScriptLoader::AddDeferRequest(ScriptLoadRequest* aRequest) { MOZ_ASSERT(aRequest->IsDeferredScript()); MOZ_ASSERT(!aRequest->mInDeferList && !aRequest->mInAsyncList); - MOZ_ASSERT(!aRequest->mInCompilingList); + + if (aRequest->mInCompilingList) { + mOffThreadCompilingRequests.Remove(aRequest); + aRequest->mInCompilingList = false; + } aRequest->mInDeferList = true; mDeferRequests.AppendElement(aRequest); @@ -4447,7 +4444,11 @@ void ScriptLoader::AddDeferRequest(ScriptLoadRequest* aRequest) { void ScriptLoader::AddAsyncRequest(ScriptLoadRequest* aRequest) { MOZ_ASSERT(aRequest->IsAsyncScript()); MOZ_ASSERT(!aRequest->mInDeferList && !aRequest->mInAsyncList); - MOZ_ASSERT(!aRequest->mInCompilingList); + + if (aRequest->mInCompilingList) { + mOffThreadCompilingRequests.Remove(aRequest); + aRequest->mInCompilingList = false; + } aRequest->mInAsyncList = true; if (aRequest->IsReadyToRun()) {