diff options
author | Moonchild <moonchild@palemoon.org> | 2020-08-24 11:11:17 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-08-24 11:13:16 +0000 |
commit | 2ca1cbe2f5e138e7b12b156296a21e47ce0aaedf (patch) | |
tree | 4a4b062e0185ea5cfd1a64d25188f9a9b4e056cd /dom/script/ScriptLoader.cpp | |
parent | 95e0f114e2b1eed6142ee51054f7122d520eb8fb (diff) | |
download | uxp-2ca1cbe2f5e138e7b12b156296a21e47ce0aaedf.tar.gz |
Issue #618 - (async, preload) Correctly pass info about async/defer to parser.
This makes sure we don't block body-referred sub-resources by head-referenced
defer and async scripts. This is important for all script loads, not just
modules, but is added here because it was run into while implementing modules.
Diffstat (limited to 'dom/script/ScriptLoader.cpp')
-rw-r--r-- | dom/script/ScriptLoader.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index 58f0c0bbe9..9216be835c 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -1050,15 +1050,17 @@ ScriptLoader::StartLoad(ScriptLoadRequest *aRequest, const nsAString &aType, NS_ENSURE_SUCCESS(rv, rv); nsIScriptElement *script = aRequest->mElement; + bool async = script ? script->GetScriptAsync() : aRequest->mPreloadAsAsync; + bool defer = script ? script->GetScriptDeferred() : aRequest->mPreloadAsDefer; + nsCOMPtr<nsIClassOfService> cos(do_QueryInterface(channel)); if (cos) { - if (aScriptFromHead && - !(script && (script->GetScriptAsync() || script->GetScriptDeferred()))) { + if (aScriptFromHead && !async && !defer) { // synchronous head scripts block lading of most other non js/css // content such as images cos->AddClassFlags(nsIClassOfService::Leader); - } else if (!(script && script->GetScriptDeferred())) { + } else if (!defer) { // other scripts are neither blocked nor prioritized unless marked deferred cos->AddClassFlags(nsIClassOfService::Unblocked); } @@ -2571,6 +2573,8 @@ ScriptLoader::PreloadURI(nsIURI *aURI, const nsAString &aCharset, const nsAString &aCrossOrigin, const nsAString& aIntegrity, bool aScriptFromHead, + bool aAsync, + bool aDefer, const mozilla::net::ReferrerPolicy aReferrerPolicy) { NS_ENSURE_TRUE_VOID(mDocument); @@ -2601,6 +2605,8 @@ ScriptLoader::PreloadURI(nsIURI *aURI, const nsAString &aCharset, Element::StringToCORSMode(aCrossOrigin), sriMetadata, aReferrerPolicy); request->mIsInline = false; + request->mPreloadAsAsync = aAsync; + request->mPreloadAsDefer = aDefer; nsresult rv = StartLoad(request, aType, aScriptFromHead); if (NS_FAILED(rv)) { |