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

Bug 1635094 - Cleanup the ReferrerInfo code. r=ckerschb

Browse Source 
The cast in InitWithNode is wrong. AsElement() asserts instead of
checking the flag, so we always pass an element (and if we didn't we'd
have type confusion problems). I audited the callers and we're fine.

Anyhow, always require an element, and add two convenience constructors
for C++ code.

Differential Revision: https://phabricator.services.mozilla.com/D73636
This commit is contained in:
Emilio Cobos Álvarez
2020-05-04 16:26:51 +00:00
parent d740104e0f
commit 41fba10f7f
27 changed files with 113 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dom/html/HTMLLinkElement.cpp
View File

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