From dcedb9328518f7d080556c5c464eb15ed46a872c Mon Sep 17 00:00:00 2001 From: Jan Varga Date: Fri, 18 Oct 2024 13:14:03 +0000 Subject: [PATCH] Bug 1867997 - Simplify signature of QuotaManager::OnOriginClearCompleted; r=dom-storage-reviewers,jari OnOriginClearCompleted currently takes two separate arguments which can be expressed as just one argument. Differential Revision: https://phabricator.services.mozilla.com/D198494 --- dom/cache/QuotaClient.cpp | 8 ++++---- dom/cache/QuotaClientImpl.h | 4 ++-- dom/fs/parent/FileSystemQuotaClient.cpp | 2 +- dom/fs/parent/FileSystemQuotaClient.h | 4 ++-- dom/indexedDB/ActorsParent.cpp | 10 +++++----- dom/localstorage/ActorsParent.cpp | 7 +++---- dom/quota/ActorsParent.cpp | 14 ++++++-------- dom/quota/Client.h | 4 ++-- dom/quota/OriginOperations.cpp | 15 +++++++-------- dom/quota/QuotaManager.h | 3 +-- dom/simpledb/ActorsParent.cpp | 7 +++---- 11 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dom/cache/QuotaClient.cpp b/dom/cache/QuotaClient.cpp index 64bb5013851b..c36802f024b0 100644 --- a/dom/cache/QuotaClient.cpp +++ b/dom/cache/QuotaClient.cpp @@ -325,12 +325,12 @@ Result CacheQuotaClient::GetUsageForOrigin( aOriginMetadata, Client::DOMCACHE); } -void CacheQuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) { +void CacheQuotaClient::OnOriginClearCompleted( + const OriginMetadata& aOriginMetadata) { AssertIsOnIOThread(); - if (aPersistenceType == quota::PERSISTENCE_TYPE_PRIVATE) { - if (auto entry = mCipherKeyManagers.Lookup(aOrigin)) { + if (aOriginMetadata.mPersistenceType == quota::PERSISTENCE_TYPE_PRIVATE) { + if (auto entry = mCipherKeyManagers.Lookup(aOriginMetadata.mOrigin)) { entry.Data()->Invalidate(); entry.Remove(); } diff --git a/dom/cache/QuotaClientImpl.h b/dom/cache/QuotaClientImpl.h index de481194314d..54728857faec 100644 --- a/dom/cache/QuotaClientImpl.h +++ b/dom/cache/QuotaClientImpl.h @@ -43,8 +43,8 @@ class CacheQuotaClient final : public quota::Client { PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata, const AtomicBool& aCanceled) override; - virtual void OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) override; + virtual void OnOriginClearCompleted( + const OriginMetadata& aOriginMetadata) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; diff --git a/dom/fs/parent/FileSystemQuotaClient.cpp b/dom/fs/parent/FileSystemQuotaClient.cpp index 48e25e7f5e39..52b79bbdcbd4 100644 --- a/dom/fs/parent/FileSystemQuotaClient.cpp +++ b/dom/fs/parent/FileSystemQuotaClient.cpp @@ -104,7 +104,7 @@ Result FileSystemQuotaClient::GetUsageForOrigin( } void FileSystemQuotaClient::OnOriginClearCompleted( - quota::PersistenceType aPersistenceType, const nsACString& aOrigin) { + const quota::OriginMetadata& aOriginMetadata) { quota::AssertIsOnIOThread(); } diff --git a/dom/fs/parent/FileSystemQuotaClient.h b/dom/fs/parent/FileSystemQuotaClient.h index e0eced35b98f..f6a5f76be9d1 100644 --- a/dom/fs/parent/FileSystemQuotaClient.h +++ b/dom/fs/parent/FileSystemQuotaClient.h @@ -35,8 +35,8 @@ class FileSystemQuotaClient : public quota::Client { const quota::OriginMetadata& aOriginMetadata, const AtomicBool& aCanceled) override; - void OnOriginClearCompleted(quota::PersistenceType aPersistenceType, - const nsACString& aOrigin) override; + void OnOriginClearCompleted( + const quota::OriginMetadata& aOriginMetadata) override; void OnRepositoryClearCompleted( quota::PersistenceType aPersistenceType) override; diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index b25437ab7cda..5e08d827037d 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -4854,8 +4854,7 @@ class QuotaClient final : public mozilla::dom::quota::Client { PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata, const AtomicBool& aCanceled) override; - void OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) override; + void OnOriginClearCompleted(const OriginMetadata& aOriginMetadata) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; @@ -12497,12 +12496,13 @@ nsresult QuotaClient::GetUsageForOriginInternal( return NS_OK; } -void QuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) { +void QuotaClient::OnOriginClearCompleted( + const OriginMetadata& aOriginMetadata) { AssertIsOnIOThread(); if (IndexedDatabaseManager* mgr = IndexedDatabaseManager::Get()) { - mgr->InvalidateFileManagers(aPersistenceType, aOrigin); + mgr->InvalidateFileManagers(aOriginMetadata.mPersistenceType, + aOriginMetadata.mOrigin); } } diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp index d22ba23c8fbf..de4dee3cf5d9 100644 --- a/dom/localstorage/ActorsParent.cpp +++ b/dom/localstorage/ActorsParent.cpp @@ -2673,8 +2673,7 @@ class QuotaClient final : public mozilla::dom::quota::Client { nsresult AboutToClearOrigins(const PersistenceScope& aPersistenceScope, const OriginScope& aOriginScope) override; - void OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) override; + void OnOriginClearCompleted(const OriginMetadata& aOriginMetadata) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; @@ -8713,8 +8712,8 @@ nsresult QuotaClient::AboutToClearOrigins( return NS_OK; } -void QuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) { +void QuotaClient::OnOriginClearCompleted( + const OriginMetadata& aOriginMetadata) { AssertIsOnIOThread(); } diff --git a/dom/quota/ActorsParent.cpp b/dom/quota/ActorsParent.cpp index a9fc99b2fd10..924a4cd28861 100644 --- a/dom/quota/ActorsParent.cpp +++ b/dom/quota/ActorsParent.cpp @@ -6493,21 +6493,20 @@ nsresult QuotaManager::AboutToClearOrigins( } void QuotaManager::OriginClearCompleted( - PersistenceType aPersistenceType, const nsACString& aOrigin, + const OriginMetadata& aOriginMetadata, const Nullable& aClientType) { AssertIsOnIOThread(); if (aClientType.IsNull()) { - if (aPersistenceType == PERSISTENCE_TYPE_PERSISTENT) { - mInitializedOriginsInternal.RemoveElement(aOrigin); + if (aOriginMetadata.mPersistenceType == PERSISTENCE_TYPE_PERSISTENT) { + mInitializedOriginsInternal.RemoveElement(aOriginMetadata.mOrigin); } for (Client::Type type : AllClientTypes()) { - (*mClients)[type]->OnOriginClearCompleted(aPersistenceType, aOrigin); + (*mClients)[type]->OnOriginClearCompleted(aOriginMetadata); } } else { - (*mClients)[aClientType.Value()]->OnOriginClearCompleted(aPersistenceType, - aOrigin); + (*mClients)[aClientType.Value()]->OnOriginClearCompleted(aOriginMetadata); } } @@ -7002,8 +7001,7 @@ void QuotaManager::ClearOrigins( } for (const auto& clearedOrigin : clearedOrigins) { - OriginClearCompleted(clearedOrigin.mPersistenceType, clearedOrigin.mOrigin, - Nullable()); + OriginClearCompleted(clearedOrigin, Nullable()); } } diff --git a/dom/quota/Client.h b/dom/quota/Client.h index 19d287f285a3..160a339c0b0a 100644 --- a/dom/quota/Client.h +++ b/dom/quota/Client.h @@ -146,8 +146,8 @@ class Client { return NS_OK; } - virtual void OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) = 0; + virtual void OnOriginClearCompleted( + const OriginMetadata& aOriginMetadata) = 0; virtual void OnRepositoryClearCompleted(PersistenceType aPersistenceType) = 0; diff --git a/dom/quota/OriginOperations.cpp b/dom/quota/OriginOperations.cpp index 60643f49d10c..bf6f8e182b5a 100644 --- a/dom/quota/OriginOperations.cpp +++ b/dom/quota/OriginOperations.cpp @@ -1248,8 +1248,8 @@ nsresult FinalizeOriginEvictionOp::DoDirectoryWork( AUTO_PROFILER_LABEL("FinalizeOriginEvictionOp::DoDirectoryWork", OTHER); for (const auto& lock : mLocks) { - aQuotaManager.OriginClearCompleted( - lock->GetPersistenceType(), lock->Origin(), Nullable()); + aQuotaManager.OriginClearCompleted(lock->OriginMetadata(), + Nullable()); } return NS_OK; @@ -2802,8 +2802,8 @@ void ClearRequestBase::DeleteFilesInternal( aQuotaManager.RemoveQuotaForOrigin(aPersistenceType, metadata); } - aQuotaManager.OriginClearCompleted( - aPersistenceType, metadata.mOrigin, Nullable()); + aQuotaManager.OriginClearCompleted(metadata, + Nullable()); break; } @@ -2840,8 +2840,8 @@ void ClearRequestBase::DeleteFilesInternal( aQuotaManager.RemoveQuotaForOrigin(aPersistenceType, metadata); - aQuotaManager.OriginClearCompleted( - aPersistenceType, metadata.mOrigin, Nullable()); + aQuotaManager.OriginClearCompleted(metadata, + Nullable()); break; } @@ -3036,8 +3036,7 @@ void ClearClientOp::DeleteFiles(const ClientMetadata& aClientMetadata) { mQuotaManager->ResetUsageForClient(aClientMetadata); } - mQuotaManager->OriginClearCompleted(aClientMetadata.mPersistenceType, - aClientMetadata.mOrigin, + mQuotaManager->OriginClearCompleted(aClientMetadata, Nullable(aClientMetadata.mClientType)); } diff --git a/dom/quota/QuotaManager.h b/dom/quota/QuotaManager.h index b7f706bf63a9..9dc57d1b790a 100644 --- a/dom/quota/QuotaManager.h +++ b/dom/quota/QuotaManager.h @@ -543,8 +543,7 @@ class QuotaManager final : public BackgroundThreadObject { const OriginScope& aOriginScope, const Nullable& aClientType); - void OriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin, + void OriginClearCompleted(const OriginMetadata& aOriginMetadata, const Nullable& aClientType); void RepositoryClearCompleted(PersistenceType aPersistenceType); diff --git a/dom/simpledb/ActorsParent.cpp b/dom/simpledb/ActorsParent.cpp index b8601f024cb7..6da5caf4517e 100644 --- a/dom/simpledb/ActorsParent.cpp +++ b/dom/simpledb/ActorsParent.cpp @@ -474,8 +474,7 @@ class QuotaClient final : public mozilla::dom::quota::Client { PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata, const AtomicBool& aCanceled) override; - void OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) override; + void OnOriginClearCompleted(const OriginMetadata& aOriginMetadata) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; @@ -1730,8 +1729,8 @@ Result QuotaClient::GetUsageForOrigin( })); } -void QuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, - const nsACString& aOrigin) { +void QuotaClient::OnOriginClearCompleted( + const OriginMetadata& aOriginMetadata) { AssertIsOnIOThread(); }