Backed out 2 changesets (bug 1554527, bug 1553867) as requested by Sylvestre for causing huge perf regressions. a=backout

Backed out changeset 1e85291f97de (bug 1554527)
Backed out changeset daf113171d63 (bug 1553867)

Author: CosminSabou

extensions/permissions/nsPermission.cpp

@@ -111,19 +111,8 @@ nsPermission::Matches(nsIPrincipal* aPrincipal, bool aExactHost,
     return NS_OK;
   }
 
-  return MatchesPrincipalForPermission(principal, aExactHost, aMatches);
-}
-
-NS_IMETHODIMP
-nsPermission::MatchesPrincipalForPermission(nsIPrincipal* aPrincipal,
-                                            bool aExactHost, bool* aMatches) {
-  NS_ENSURE_ARG_POINTER(aPrincipal);
-  NS_ENSURE_ARG_POINTER(aMatches);
-
-  *aMatches = false;
-
   // If the principals are equal, then they match.
-  if (mPrincipal->Equals(aPrincipal)) {
+  if (mPrincipal->Equals(principal)) {
     *aMatches = true;
     return NS_OK;
   }
@@ -136,15 +125,15 @@ nsPermission::MatchesPrincipalForPermission(nsIPrincipal* aPrincipal,
 
   // Compare their OriginAttributes
   const mozilla::OriginAttributes& theirAttrs =
-      aPrincipal->OriginAttributesRef();
+      principal->OriginAttributesRef();
   const mozilla::OriginAttributes& ourAttrs = mPrincipal->OriginAttributesRef();
 
   if (theirAttrs != ourAttrs) {
     return NS_OK;
   }
 
   nsCOMPtr<nsIURI> theirURI;
-  nsresult rv = aPrincipal->GetURI(getter_AddRefs(theirURI));
+  nsresult rv = principal->GetURI(getter_AddRefs(theirURI));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIURI> ourURI;

netwerk/base/nsIPermission.idl

@@ -67,13 +67,6 @@ interface nsIPermission : nsISupports
     boolean matches(in nsIPrincipal principal,
                     in boolean exactHost);
 
-    /**
-     * Similar to matches() but the principal's URI should be just an origin
-     * (no path, no queryString, etc).
-     */
-    [noscript] boolean matchesPrincipalForPermission(in nsIPrincipal principal,
-                                                     in boolean exactHost);
-
     /**
      * Test whether a URI would be affected by this permission.
      * NOTE: This performs matches with default origin attribute values.

netwerk/cookie/CookieSettings.cpp

@@ -125,27 +125,19 @@ CookieSettings::CookiePermission(nsIPrincipal* aPrincipal,
   nsresult rv;
 
   // Let's see if we know this permission.
-  if (!mCookiePermissions.IsEmpty()) {
-    nsCOMPtr<nsIPrincipal> principal =
-        nsPermission::ClonePrincipalForPermission(aPrincipal);
-    if (NS_WARN_IF(!principal)) {
-      return NS_ERROR_FAILURE;
+  for (const RefPtr<nsIPermission>& permission : mCookiePermissions) {
+    bool match = false;
+    rv = permission->Matches(aPrincipal, false, &match);
+    if (NS_WARN_IF(NS_FAILED(rv)) || !match) {
+      continue;
     }
 
-    for (const RefPtr<nsIPermission>& permission : mCookiePermissions) {
-      bool match = false;
-      rv = permission->MatchesPrincipalForPermission(aPrincipal, false, &match);
-      if (NS_WARN_IF(NS_FAILED(rv)) || !match) {
-        continue;
-      }
-
-      rv = permission->GetCapability(aCookiePermission);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-
-      return NS_OK;
+    rv = permission->GetCapability(aCookiePermission);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
     }
+
+    return NS_OK;
   }
 
   // Let's ask the permission manager.