зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1340710 - Part 10 - Remove BasePrincipal::EqualsIgnoringAddonId which somehow crept back in during the last rebase
Landed on a CLOSED TREE
This commit is contained in:
Родитель
3812e3f854
Коммит
e3ddbde083
|
@ -397,22 +397,6 @@ BasePrincipal::EqualsConsideringDomain(nsIPrincipal *aOther, bool *aResult)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
BasePrincipal::EqualsIgnoringAddonId(nsIPrincipal *aOther)
|
|
||||||
{
|
|
||||||
MOZ_ASSERT(aOther);
|
|
||||||
|
|
||||||
// Note that this will not work for expanded principals, nor is it intended
|
|
||||||
// to.
|
|
||||||
if (!dom::ChromeUtils::IsOriginAttributesEqualIgnoringAddonId(
|
|
||||||
OriginAttributesRef(), Cast(aOther)->OriginAttributesRef())) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return SubsumesInternal(aOther, DontConsiderDocumentDomain) &&
|
|
||||||
Cast(aOther)->SubsumesInternal(this, DontConsiderDocumentDomain);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
BasePrincipal::FastSubsumes(nsIPrincipal* aOther)
|
BasePrincipal::FastSubsumes(nsIPrincipal* aOther)
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче