Bug 1340710 - Part 10 - Remove BasePrincipal::EqualsIgnoringAddonId which somehow crept back in during the last rebase
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 06 Mar 2017 23:21:59 -0500
changeset 346293 5dd02b882459fe98a58cde580a215793def4880e
parent 346292 8cd9e592cc85ff5f48d65160bf64e7dfc9c8c844
child 346294 da035ac87fe46773e46942b0e30bbbc2d28e8c8e
push id31460
push usercbook@mozilla.com
push dateTue, 07 Mar 2017 14:14:00 +0000
treeherdermozilla-central@47e5c929a487 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1340710
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1340710 - Part 10 - Remove BasePrincipal::EqualsIgnoringAddonId which somehow crept back in during the last rebase Landed on a CLOSED TREE
caps/BasePrincipal.cpp
--- a/caps/BasePrincipal.cpp
+++ b/caps/BasePrincipal.cpp
@@ -393,32 +393,16 @@ BasePrincipal::EqualsConsideringDomain(n
   }
 
   *aResult = Subsumes(aOther, ConsiderDocumentDomain) &&
              other->Subsumes(this, ConsiderDocumentDomain);
   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
 BasePrincipal::FastSubsumes(nsIPrincipal* aOther)
 {
   // If two principals are equal, then they both subsume each other.
   // We deal with two special cases first:
   // Null principals only subsume each other if they are equal, and are only
   // equal if they're the same object.
   // Also, if mOriginNoSuffix is null, FastEquals falls back to the slow path
   // using Subsumes, so we don't want to use it in that case to avoid an