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

Backed out 2 changesets (bug 1635094) for build bustages on nsMacShellService.cpp. CLOSED TREE

Browse Source 
Backed out changeset 0a2b0c6ea19a (bug 1635094)
Backed out changeset ead4f26f76ee (bug 1635094)
This commit is contained in:
Cosmin Sabou
2020-05-04 20:04:06 +03:00
parent c8ea5056f1
commit 00d059a4c0
28 changed files with 161 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dom/html/HTMLLinkElement.cpp
View File

@@ -469,6 +469,8 @@ Maybe<nsStyleLinkElement::SheetInfo> HTMLLinkElement::GetStyleSheetInfo() {
nsCOMPtr<nsIURI> uri = Link::GetURI();
nsCOMPtr<nsIPrincipal> prin = mTriggeringPrincipal;
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo();
referrerInfo->InitWithNode(this);
nsAutoString nonce;
nsString* cspNonce = static_cast<nsString*>(GetProperty(nsGkAtoms::nonce));
@@ -481,7 +483,7 @@ Maybe<nsStyleLinkElement::SheetInfo> HTMLLinkElement::GetStyleSheetInfo() {
this,
uri.forget(),
prin.forget(),
MakeAndAddRef<ReferrerInfo>(*this),
referrerInfo.forget(),
GetCORSMode(),
title,
media,
@@ -617,7 +619,8 @@ void HTMLLinkElement::
}
}
auto referrerInfo = MakeRefPtr<ReferrerInfo>(*this);
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo();
referrerInfo->InitWithNode(this);
if (preload) {
prefetchService->PreloadURI(uri, referrerInfo, this, policyType);
} else {
@@ -701,7 +704,8 @@ void HTMLLinkElement::UpdatePreload(nsAtom* aName, const nsAttrValue* aValue,
if (corsMode != oldCorsMode) {
prefetchService->CancelPrefetchPreloadURI(uri, this);
auto referrerInfo = MakeRefPtr<ReferrerInfo>(*this);
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo();
referrerInfo->InitWithNode(this);
prefetchService->PreloadURI(uri, referrerInfo, this, policyType);
}
return;
@@ -758,7 +762,8 @@ void HTMLLinkElement::UpdatePreload(nsAtom* aName, const nsAttrValue* aValue,
// trigger an error event.
if ((policyType != oldPolicyType) ||
(policyType == nsIContentPolicy::TYPE_INVALID)) {
auto referrerInfo = MakeRefPtr<ReferrerInfo>(*this);
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo();
referrerInfo->InitWithNode(this);
prefetchService->PreloadURI(uri, referrerInfo, this, policyType);
}
}