Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 5 insertions, 7 deletions

diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
index 2554628d7f..639c3822ac 100644
--- a/dom/localstorage/ActorsParent.cpp
+++ b/dom/localstorage/ActorsParent.cpp
@@ -1530,9 +1530,7 @@ class Datastore final
   uint32_t PrivateBrowsingId() const { return mPrivateBrowsingId; }
 
   bool IsPersistent() const {
-    // Private-browsing is forbidden from touching disk, but
-    // StorageAccess::eSessionScoped is allowed to touch disk because
-    // QuotaManager's storage for such origins is wiped at shutdown.
+    // Private-browsing is forbidden from touching disk.
     return mPrivateBrowsingId == 0;
   }
 
diff --git a/dom/localstorage/LocalStorageManager2.cpp b/dom/localstorage/LocalStorageManager2.cpp
index 5e19cf2254..cd2cd9eca0 100644
--- a/dom/localstorage/LocalStorageManager2.cpp
+++ b/dom/localstorage/LocalStorageManager2.cpp
@@ -223,7 +223,7 @@ LocalStorageManager2::PrecacheStorage(nsIPrincipal* aPrincipal,
   // implementation to perform a preload in the content/current process.  That's
   // not how things work in LSNG.  Instead everything happens in the parent
   // process, triggered by the official preloading spot,
-  // ContentParent::AboutToLoadHttpFtpDocumentForChild.
+  // ContentParent::AboutToLoadHttpDocumentForChild.
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
diff --git a/dom/localstorage/PBackgroundLSDatabase.ipdl b/dom/localstorage/PBackgroundLSDatabase.ipdl
index 2f2f9dffac..179bd4164d 100644
--- a/dom/localstorage/PBackgroundLSDatabase.ipdl
+++ b/dom/localstorage/PBackgroundLSDatabase.ipdl
@@ -89,7 +89,7 @@ struct LSSnapshotInitInfo
  * calls to PBackground are the only viable mechanism because blocking
  * PBackground is not acceptable.  (Note that an attempt is made to minimize any
  * I/O latency by triggering preloading from
- * ContentParent::AboutToLoadHttpFtpDocumentForChild, the central place
+ * ContentParent::AboutToLoadHttpDocumentForChild, the central place
  * for pre-loading.)
  */
 [ChildImpl=virtual, ParentImpl=virtual]
diff --git a/dom/localstorage/SnappyUtils.cpp b/dom/localstorage/SnappyUtils.cpp
index cf47421bc5..cf8c08e13f 100644
--- a/dom/localstorage/SnappyUtils.cpp
+++ b/dom/localstorage/SnappyUtils.cpp
@@ -16,7 +16,7 @@
 
 namespace mozilla::dom {
 
-static_assert(SNAPPY_VERSION == 0x010109);
+static_assert(SNAPPY_VERSION == 0x010200);
 
 bool SnappyCompress(const nsACString& aSource, nsACString& aDest) {
   MOZ_ASSERT(!aSource.IsVoid());
diff --git a/dom/localstorage/nsILocalStorageManager.idl b/dom/localstorage/nsILocalStorageManager.idl
index 0e8db22482..6ee29b4e14 100644
--- a/dom/localstorage/nsILocalStorageManager.idl
+++ b/dom/localstorage/nsILocalStorageManager.idl
@@ -20,7 +20,7 @@ interface nsILocalStorageManager : nsISupports
 
   /**
    * Trigger preload of LocalStorage for the given principal.  For use by
-   * ContentParent::AboutToLoadHttpFtpDocumentForChild to maximize the
+   * ContentParent::AboutToLoadHttpDocumentForChild to maximize the
    * amount of time we have to load the data off disk before the page might
    * attempt to touch LocalStorage.
    *