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/quota/CachingDatabaseConnection.h | |
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/quota/CachingDatabaseConnection.h')
-rw-r--r-- | dom/quota/CachingDatabaseConnection.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dom/quota/CachingDatabaseConnection.h b/dom/quota/CachingDatabaseConnection.h index ea94035a34..c9d7dbdd6b 100644 --- a/dom/quota/CachingDatabaseConnection.h +++ b/dom/quota/CachingDatabaseConnection.h @@ -14,6 +14,7 @@ #include "nscore.h" #include "nsHashKeys.h" #include "nsInterfaceHashtable.h" +#include "nsISupportsImpl.h" #include "nsString.h" #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" @@ -55,7 +56,7 @@ class CachingDatabaseConnection { BorrowedStatement(NotNull<mozIStorageStatement*> aStatement, const nsACString& aQuery) : mozStorageStatementScoper(aStatement), - mExtraInfo{ScopedLogExtraInfo::kTagQuery, aQuery} {} + mExtraInfo{ScopedLogExtraInfo::kTagQueryTainted, aQuery} {} ScopedLogExtraInfo mExtraInfo; #else @@ -67,8 +68,9 @@ class CachingDatabaseConnection { class LazyStatement; void AssertIsOnConnectionThread() const { -#ifdef CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP - mOwningThread->AssertOwnership("CachingDatabaseConnection not thread-safe"); +#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED + mOwningEventTarget->AssertOwnership( + "CachingDatabaseConnection not thread-safe"); #endif } @@ -125,8 +127,8 @@ class CachingDatabaseConnection { void Close(); private: -#ifdef CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP - LazyInitializedOnce<const nsAutoOwningThread> mOwningThread; +#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED + LazyInitializedOnce<const nsAutoOwningEventTarget> mOwningEventTarget; #endif LazyInitializedOnceEarlyDestructible< |