Bug 1615321 - Remove GetUri call in StorageObserver r=ckerschb

Differential Revision: https://phabricator.services.mozilla.com/D62765 --HG-- extra : moz-landing-system : lando
dothq · Feb 24, 2020 · 4018f86 · 4018f86
1 parent 675474d
commit 4018f86
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp
@@ -71,6 +71,17 @@ BasePrincipal::GetHostPort(nsACString& aRes) {
   return prinURI->GetHostPort(aRes);
 }
 
+NS_IMETHODIMP
+BasePrincipal::GetHost(nsACString& aRes) {
+  aRes.Truncate();
+  nsCOMPtr<nsIURI> prinURI;
+  nsresult rv = GetURI(getter_AddRefs(prinURI));
+  if (NS_FAILED(rv) || !prinURI) {
+    return NS_OK;
+  }
+  return prinURI->GetHost(aRes);
+}
+
 NS_IMETHODIMP
 BasePrincipal::GetOriginNoSuffix(nsACString& aOrigin) {
   MOZ_ASSERT(mInitialized);

diff --git a/caps/BasePrincipal.h b/caps/BasePrincipal.h
@@ -129,6 +129,7 @@ class BasePrincipal : public nsJSPrincipals {
   NS_IMETHOD GetAsciiSpec(nsACString& aSpec) override;
   NS_IMETHOD GetExposablePrePath(nsACString& aResult) override;
   NS_IMETHOD GetHostPort(nsACString& aRes) override;
+  NS_IMETHOD GetHost(nsACString& aRes) override;
   NS_IMETHOD GetPrepath(nsACString& aResult) override;
   NS_IMETHOD GetOriginSuffix(nsACString& aOriginSuffix) final;
   NS_IMETHOD GetIsOnion(bool* aIsOnion) override;

diff --git a/caps/nsIPrincipal.idl b/caps/nsIPrincipal.idl
@@ -230,6 +230,12 @@ interface nsIPrincipal : nsISerializable
     [noscript] readonly attribute ACString asciiHost;
 
 
+    /**
+     * Returns the "host" portion of the 
+     * Principals URI, if any.
+     */
+    [noscript] readonly attribute ACString host;
+
     /**
         * Returns the prepath of the principals uri
         * follows the format scheme:

diff --git a/dom/storage/StorageObserver.cpp b/dom/storage/StorageObserver.cpp
@@ -265,14 +265,8 @@ StorageObserver::Observe(nsISupports* aSubject, const char* aTopic,
     BasePrincipal::Cast(principal)->OriginAttributesRef().CreateSuffix(
         originSuffix);
 
-    nsCOMPtr<nsIURI> origin;
-    principal->GetURI(getter_AddRefs(origin));
-    if (!origin) {
-      return NS_OK;
-    }
-
     nsAutoCString host;
-    origin->GetHost(host);
+    principal->GetHost(host);
     if (host.IsEmpty()) {
       return NS_OK;
     }