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

22
dom/base/nsImageLoadingContent.cpp
View File

@@ -1145,17 +1145,22 @@ nsresult nsImageLoadingContent::LoadImage(nsIURI* aNewURI, bool aForce,
//
// We use the principal of aDocument to avoid having to QI |this| an extra
// time. It should always be the same as the principal of this node.
Element* element = AsContent()->AsElement();
MOZ_ASSERT(element->NodePrincipal() == aDocument->NodePrincipal(),
#ifdef DEBUG
nsIContent* thisContent = AsContent();
MOZ_ASSERT(thisContent->NodePrincipal() == aDocument->NodePrincipal(),
"Principal mismatch?");
#endif
nsLoadFlags loadFlags =
aLoadFlags | nsContentUtils::CORSModeToLoadImageFlags(GetCORSMode());
RefPtr<imgRequestProxy>& req = PrepareNextRequest(aImageLoadType);
nsCOMPtr<nsIContent> content =
do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
nsCOMPtr<nsIPrincipal> triggeringPrincipal;
bool result = nsContentUtils::QueryTriggeringPrincipal(
element, aTriggeringPrincipal, getter_AddRefs(triggeringPrincipal));
content, aTriggeringPrincipal, getter_AddRefs(triggeringPrincipal));
// If result is true, which means this node has specified
// 'triggeringprincipal' attribute on it, so we use favicon as the policy
@@ -1164,10 +1169,14 @@ nsresult nsImageLoadingContent::LoadImage(nsIURI* aNewURI, bool aForce,
result ? nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON
: PolicyTypeForLoad(aImageLoadType);
auto referrerInfo = MakeRefPtr<ReferrerInfo>(*element);
nsCOMPtr<nsINode> thisNode =
do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo();
referrerInfo->InitWithNode(thisNode);
nsresult rv = nsContentUtils::LoadImage(
aNewURI, element, aDocument, triggeringPrincipal, 0, referrerInfo, this,
loadFlags, element->LocalName(), getter_AddRefs(req), policyType,
aNewURI, thisNode, aDocument, triggeringPrincipal, 0, referrerInfo, this,
loadFlags, content->LocalName(), getter_AddRefs(req), policyType,
mUseUrgentStartForChannel);
// Reset the flag to avoid loading from XPCOM or somewhere again else without
@@ -1323,6 +1332,7 @@ void nsImageLoadingContent::UpdateImageState(bool aNotify) {
}
}
NS_ASSERTION(thisContent->IsElement(), "Not an element?");
thisContent->AsElement()->UpdateState(aNotify);
}