From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- dom/localstorage/LSSnapshot.cpp | 2 +- dom/localstorage/test/unit/databaseShadowing-shared.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'dom/localstorage') diff --git a/dom/localstorage/LSSnapshot.cpp b/dom/localstorage/LSSnapshot.cpp index 85920b8b09..a9c0c4bc5d 100644 --- a/dom/localstorage/LSSnapshot.cpp +++ b/dom/localstorage/LSSnapshot.cpp @@ -378,7 +378,7 @@ nsresult LSSnapshot::SetItem(const nsAString& aKey, const nsAString& aValue, { quota::ScopedLogExtraInfo scope{ - quota::ScopedLogExtraInfo::kTagContext, + quota::ScopedLogExtraInfo::kTagContextTainted, "dom::localstorage::LSSnapshot::SetItem::UpdateUsage"_ns}; QM_TRY(MOZ_TO_RESULT(UpdateUsage(delta)), QM_PROPAGATE, QM_NO_CLEANUP, ([]() { diff --git a/dom/localstorage/test/unit/databaseShadowing-shared.js b/dom/localstorage/test/unit/databaseShadowing-shared.js index ffee8579cb..77d6c09e39 100644 --- a/dom/localstorage/test/unit/databaseShadowing-shared.js +++ b/dom/localstorage/test/unit/databaseShadowing-shared.js @@ -1,5 +1,7 @@ /* import-globals-from head.js */ +/* eslint-disable mozilla/no-comparison-or-assignment-inside-ok */ + const principalInfos = [ { url: "http://example.com", attrs: {} }, -- cgit v1.2.3