Bug 1629707 - make SessionStorage support StoragePrincipal; r=baku

Differential Revision: https://phabricator.services.mozilla.com/D72764
iaxat · Apr 29, 2020 · 100b60e · 100b60e
1 parent 0047d68
commit 100b60e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/dom/storage/SessionStorage.cpp b/dom/storage/SessionStorage.cpp
@@ -31,10 +31,11 @@ NS_IMPL_RELEASE_INHERITED(SessionStorage, Storage)
 
 SessionStorage::SessionStorage(nsPIDOMWindowInner* aWindow,
                                nsIPrincipal* aPrincipal,
+                               nsIPrincipal* aStoragePrincipal,
                                SessionStorageCache* aCache,
                                SessionStorageManager* aManager,
                                const nsAString& aDocumentURI, bool aIsPrivate)
-    : Storage(aWindow, aPrincipal, aPrincipal),
+    : Storage(aWindow, aPrincipal, aStoragePrincipal),
       mCache(aCache),
       mManager(aManager),
       mDocumentURI(aDocumentURI),

diff --git a/dom/storage/SessionStorage.h b/dom/storage/SessionStorage.h
@@ -23,8 +23,9 @@ class SessionStorage final : public Storage {
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SessionStorage, Storage)
 
   SessionStorage(nsPIDOMWindowInner* aWindow, nsIPrincipal* aPrincipal,
-                 SessionStorageCache* aCache, SessionStorageManager* aManager,
-                 const nsAString& aDocumentURI, bool aIsPrivate);
+                 nsIPrincipal* aStoragePrincipal, SessionStorageCache* aCache,
+                 SessionStorageManager* aManager, const nsAString& aDocumentURI,
+                 bool aIsPrivate);
 
   StorageType Type() const override { return eSessionStorage; }
 

diff --git a/dom/storage/SessionStorageManager.cpp b/dom/storage/SessionStorageManager.cpp
@@ -170,9 +170,9 @@ SessionStorageManager::CreateStorage(mozIDOMWindow* aWindow,
 
   nsCOMPtr<nsPIDOMWindowInner> inner = nsPIDOMWindowInner::From(aWindow);
 
-  // No StoragePrincipal for sessionStorage.
-  RefPtr<SessionStorage> storage = new SessionStorage(
-      inner, aPrincipal, cache, this, aDocumentURI, aPrivate);
+  RefPtr<SessionStorage> storage =
+      new SessionStorage(inner, aPrincipal, aStoragePrincipal, cache, this,
+                         aDocumentURI, aPrivate);
 
   storage.forget(aRetval);
   return NS_OK;
@@ -194,8 +194,9 @@ SessionStorageManager::GetStorage(mozIDOMWindow* aWindow,
 
   nsCOMPtr<nsPIDOMWindowInner> inner = nsPIDOMWindowInner::From(aWindow);
 
-  RefPtr<SessionStorage> storage = new SessionStorage(
-      inner, aStoragePrincipal, cache, this, EmptyString(), aPrivate);
+  RefPtr<SessionStorage> storage =
+      new SessionStorage(inner, aPrincipal, aStoragePrincipal, cache, this,
+                         EmptyString(), aPrivate);
 
   storage.forget(aRetval);
   return NS_OK;