Bug 1726714: Move IsShuttingDownOn(Non)BackgroundThread functions to …

…Client base class. r=dom-storage-reviewers,janv Differential Revision: https://phabricator.services.mozilla.com/D140802
dothq · Apr 14, 2022 · 8140992 · 8140992
1 parent 67c200a
commit 8140992
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 48 deletions.
diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
@@ -4925,22 +4925,6 @@ class QuotaClient final : public mozilla::dom::quota::Client {
     return sInstance;
   }
 
-  static bool IsShuttingDownOnBackgroundThread() {
-    AssertIsOnBackgroundThread();
-
-    if (sInstance) {
-      return sInstance->IsShuttingDown();
-    }
-
-    return QuotaManager::IsShuttingDown();
-  }
-
-  static bool IsShuttingDownOnNonBackgroundThread() {
-    MOZ_ASSERT(!IsOnBackgroundThread());
-
-    return QuotaManager::IsShuttingDown();
-  }
-
   nsIEventTarget* BackgroundThread() const {
     MOZ_ASSERT(mBackgroundThread);
     return mBackgroundThread;

diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
@@ -2623,22 +2623,6 @@ class QuotaClient final : public mozilla::dom::quota::Client {
     return sInstance;
   }
 
-  static bool IsShuttingDownOnBackgroundThread() {
-    AssertIsOnBackgroundThread();
-
-    if (sInstance) {
-      return sInstance->IsShuttingDown();
-    }
-
-    return QuotaManager::IsShuttingDown();
-  }
-
-  static bool IsShuttingDownOnNonBackgroundThread() {
-    MOZ_ASSERT(!IsOnBackgroundThread());
-
-    return QuotaManager::IsShuttingDown();
-  }
-
   mozilla::Mutex& ShadowDatabaseMutex() {
     MOZ_ASSERT(IsOnIOThread() || IsOnGlobalConnectionThread());
 

diff --git a/dom/quota/Client.cpp b/dom/quota/Client.cpp
@@ -14,6 +14,7 @@
 namespace mozilla::dom::quota {
 
 using mozilla::ipc::AssertIsOnBackgroundThread;
+using mozilla::ipc::IsOnBackgroundThread;
 
 namespace {
 
@@ -246,4 +247,16 @@ void Client::FinalizeShutdownWorkThreads() {
   FinalizeShutdown();
 }
 
+// static
+bool Client::IsShuttingDownOnBackgroundThread() {
+  MOZ_ASSERT(IsOnBackgroundThread());
+  return QuotaManager::IsShuttingDown();
+}
+
+// static
+bool Client::IsShuttingDownOnNonBackgroundThread() {
+  MOZ_ASSERT(!IsOnBackgroundThread());
+  return QuotaManager::IsShuttingDown();
+}
+
 }  // namespace mozilla::dom::quota
diff --git a/dom/quota/Client.h b/dom/quota/Client.h
@@ -157,6 +157,14 @@ class Client {
 
   virtual void StopIdleMaintenance() = 0;
 
+  // Both variants just check for QuotaManager::IsShuttingDown()
+  // but assert to be on the right thread.
+  // They must not be used for re-entrance checks.
+  // Deprecated: This distinction is not needed anymore.
+  // QuotaClients should call QuotaManager::IsShuttingDown instead.
+  static bool IsShuttingDownOnBackgroundThread();
+  static bool IsShuttingDownOnNonBackgroundThread();
+
   // Returns true if there is work that needs to be waited for.
   bool InitiateShutdownWorkThreads();
   void FinalizeShutdownWorkThreads();

diff --git a/dom/simpledb/ActorsParent.cpp b/dom/simpledb/ActorsParent.cpp
@@ -452,22 +452,6 @@ class QuotaClient final : public mozilla::dom::quota::Client {
  public:
   QuotaClient();
 
-  static bool IsShuttingDownOnBackgroundThread() {
-    AssertIsOnBackgroundThread();
-
-    if (sInstance) {
-      return sInstance->IsShuttingDown();
-    }
-
-    return QuotaManager::IsShuttingDown();
-  }
-
-  static bool IsShuttingDownOnNonBackgroundThread() {
-    MOZ_ASSERT(!IsOnBackgroundThread());
-
-    return QuotaManager::IsShuttingDown();
-  }
-
   bool IsShuttingDown() const {
     AssertIsOnBackgroundThread();