diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /dom/storage | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/storage')
-rw-r--r-- | dom/storage/SessionStorageManager.cpp | 3 | ||||
-rw-r--r-- | dom/storage/StorageDBUpdater.cpp | 5 | ||||
-rw-r--r-- | dom/storage/StorageUtils.cpp | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/dom/storage/SessionStorageManager.cpp b/dom/storage/SessionStorageManager.cpp index 020083730a..a64d578426 100644 --- a/dom/storage/SessionStorageManager.cpp +++ b/dom/storage/SessionStorageManager.cpp @@ -26,6 +26,7 @@ #include "mozilla/ipc/BackgroundChild.h" #include "mozilla/ipc/BackgroundParent.h" #include "mozilla/ipc/PBackgroundChild.h" +#include "nsIXULRuntime.h" #include "nsTHashMap.h" #include "nsThreadUtils.h" @@ -918,7 +919,7 @@ void BackgroundSessionStorageManager::SetCurrentBrowsingContextId( } void BackgroundSessionStorageManager::MaybeScheduleSessionStoreUpdate() { - if (!StaticPrefs::browser_sessionstore_platform_collection_AtStartup()) { + if (!SessionStorePlatformCollection()) { return; } diff --git a/dom/storage/StorageDBUpdater.cpp b/dom/storage/StorageDBUpdater.cpp index 7dec6425e2..255deddb4d 100644 --- a/dom/storage/StorageDBUpdater.cpp +++ b/dom/storage/StorageDBUpdater.cpp @@ -15,6 +15,7 @@ #include "mozilla/Tokenizer.h" #include "mozIStorageConnection.h" #include "mozStorageHelper.h" +#include "mozilla/StorageOriginAttributes.h" // Current version of the database schema #define CURRENT_SCHEMA_VERSION 2 @@ -131,8 +132,8 @@ class ExtractOriginData : protected mozilla::Tokenizer { } } } else { - OriginAttributes attrs(inIsolatedMozBrowser); - attrs.CreateSuffix(suffix); + StorageOriginAttributes originAttributes(inIsolatedMozBrowser); + originAttributes.CreateSuffix(suffix); } // Consume the rest of the input as "origin". diff --git a/dom/storage/StorageUtils.cpp b/dom/storage/StorageUtils.cpp index 39a69c3f08..cb7a74c73f 100644 --- a/dom/storage/StorageUtils.cpp +++ b/dom/storage/StorageUtils.cpp @@ -13,6 +13,7 @@ #include "nsIURI.h" #include "nsNetUtil.h" #include "nsPrintfCString.h" +#include "mozilla/StorageOriginAttributes.h" namespace mozilla::dom::StorageUtils { @@ -61,16 +62,16 @@ nsCString Scheme0Scope(const nsACString& aOriginSuffix, const nsACString& aOriginNoSuffix) { nsCString result; - OriginAttributes oa; + StorageOriginAttributes oa; if (!aOriginSuffix.IsEmpty()) { DebugOnly<bool> success = oa.PopulateFromSuffix(aOriginSuffix); MOZ_ASSERT(success); } - if (oa.mInIsolatedMozBrowser) { + if (oa.InIsolatedMozBrowser()) { result.AppendInt(0); // This is the appId to be removed. result.Append(':'); - result.Append(oa.mInIsolatedMozBrowser ? 't' : 'f'); + result.Append(oa.InIsolatedMozBrowser() ? 't' : 'f'); result.Append(':'); } @@ -80,7 +81,7 @@ nsCString Scheme0Scope(const nsACString& aOriginSuffix, // with originAttributes and originKey columns) so that switch between // schema 1 and 0 always works in both ways. nsAutoCString remaining; - oa.mInIsolatedMozBrowser = false; + oa.SetInIsolatedMozBrowser(false); oa.CreateSuffix(remaining); if (!remaining.IsEmpty()) { MOZ_ASSERT(!aOriginSuffix.IsEmpty()); |