corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1867997 - Simplify signature of QuotaManager::OnOriginClearCompleted; r=dom-storage-reviewers,jari

Browse Source 
OnOriginClearCompleted currently takes two separate arguments which can be
expressed as just one argument.

Differential Revision: https://phabricator.services.mozilla.com/D198494
This commit is contained in:
Jan Varga
2024-10-18 13:14:03 +00:00
parent d5c7897c55
commit dcedb93285
11 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dom/cache/QuotaClient.cpp vendored
View File

@@ -325,12 +325,12 @@ Result<UsageInfo, nsresult> CacheQuotaClient::GetUsageForOrigin(
aOriginMetadata, Client::DOMCACHE); aOriginMetadata, Client::DOMCACHE);
} }
void CacheQuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, void CacheQuotaClient::OnOriginClearCompleted(
const nsACString& aOrigin) { const OriginMetadata& aOriginMetadata) {
AssertIsOnIOThread(); AssertIsOnIOThread();
if (aPersistenceType == quota::PERSISTENCE_TYPE_PRIVATE) { if (aOriginMetadata.mPersistenceType == quota::PERSISTENCE_TYPE_PRIVATE) {
if (auto entry = mCipherKeyManagers.Lookup(aOrigin)) { if (auto entry = mCipherKeyManagers.Lookup(aOriginMetadata.mOrigin)) {
entry.Data()->Invalidate(); entry.Data()->Invalidate();
entry.Remove(); entry.Remove();
} }

4
dom/cache/QuotaClientImpl.h vendored
View File

@@ -43,8 +43,8 @@ class CacheQuotaClient final : public quota::Client {
PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata, PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata,
const AtomicBool& aCanceled) override; const AtomicBool& aCanceled) override;
virtual void OnOriginClearCompleted(PersistenceType aPersistenceType, virtual void OnOriginClearCompleted(
const nsACString& aOrigin) override; const OriginMetadata& aOriginMetadata) override;
void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override;

2
dom/fs/parent/FileSystemQuotaClient.cpp
View File

@@ -104,7 +104,7 @@ Result<quota::UsageInfo, nsresult> FileSystemQuotaClient::GetUsageForOrigin(
} }
void FileSystemQuotaClient::OnOriginClearCompleted( void FileSystemQuotaClient::OnOriginClearCompleted(
quota::PersistenceType aPersistenceType, const nsACString& aOrigin) { const quota::OriginMetadata& aOriginMetadata) {
quota::AssertIsOnIOThread(); quota::AssertIsOnIOThread();
} }

4
dom/fs/parent/FileSystemQuotaClient.h
View File

@@ -35,8 +35,8 @@ class FileSystemQuotaClient : public quota::Client {
const quota::OriginMetadata& aOriginMetadata, const quota::OriginMetadata& aOriginMetadata,
const AtomicBool& aCanceled) override; const AtomicBool& aCanceled) override;
void OnOriginClearCompleted(quota::PersistenceType aPersistenceType, void OnOriginClearCompleted(
const nsACString& aOrigin) override; const quota::OriginMetadata& aOriginMetadata) override;
void OnRepositoryClearCompleted( void OnRepositoryClearCompleted(
quota::PersistenceType aPersistenceType) override; quota::PersistenceType aPersistenceType) override;

10
dom/indexedDB/ActorsParent.cpp
View File

@@ -4854,8 +4854,7 @@ class QuotaClient final : public mozilla::dom::quota::Client {
PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata, PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata,
const AtomicBool& aCanceled) override; const AtomicBool& aCanceled) override;
void OnOriginClearCompleted(PersistenceType aPersistenceType, void OnOriginClearCompleted(const OriginMetadata& aOriginMetadata) override;
const nsACString& aOrigin) override;
void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override;
@@ -12497,12 +12496,13 @@ nsresult QuotaClient::GetUsageForOriginInternal(
return NS_OK; return NS_OK;
} }
void QuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, void QuotaClient::OnOriginClearCompleted(
const nsACString& aOrigin) { const OriginMetadata& aOriginMetadata) {
AssertIsOnIOThread(); AssertIsOnIOThread();
if (IndexedDatabaseManager* mgr = IndexedDatabaseManager::Get()) { if (IndexedDatabaseManager* mgr = IndexedDatabaseManager::Get()) {
mgr->InvalidateFileManagers(aPersistenceType, aOrigin); mgr->InvalidateFileManagers(aOriginMetadata.mPersistenceType,
aOriginMetadata.mOrigin);
} }
} }

7
dom/localstorage/ActorsParent.cpp
View File

@@ -2673,8 +2673,7 @@ class QuotaClient final : public mozilla::dom::quota::Client {
nsresult AboutToClearOrigins(const PersistenceScope& aPersistenceScope, nsresult AboutToClearOrigins(const PersistenceScope& aPersistenceScope,
const OriginScope& aOriginScope) override; const OriginScope& aOriginScope) override;
void OnOriginClearCompleted(PersistenceType aPersistenceType, void OnOriginClearCompleted(const OriginMetadata& aOriginMetadata) override;
const nsACString& aOrigin) override;
void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override;
@@ -8713,8 +8712,8 @@ nsresult QuotaClient::AboutToClearOrigins(
return NS_OK; return NS_OK;
} }
void QuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, void QuotaClient::OnOriginClearCompleted(
const nsACString& aOrigin) { const OriginMetadata& aOriginMetadata) {
AssertIsOnIOThread(); AssertIsOnIOThread();
} }

14
dom/quota/ActorsParent.cpp
View File

@@ -6493,21 +6493,20 @@ nsresult QuotaManager::AboutToClearOrigins(
} }
void QuotaManager::OriginClearCompleted( void QuotaManager::OriginClearCompleted(
PersistenceType aPersistenceType, const nsACString& aOrigin, const OriginMetadata& aOriginMetadata,
const Nullable<Client::Type>& aClientType) { const Nullable<Client::Type>& aClientType) {
AssertIsOnIOThread(); AssertIsOnIOThread();
if (aClientType.IsNull()) { if (aClientType.IsNull()) {
if (aPersistenceType == PERSISTENCE_TYPE_PERSISTENT) { if (aOriginMetadata.mPersistenceType == PERSISTENCE_TYPE_PERSISTENT) {
mInitializedOriginsInternal.RemoveElement(aOrigin); mInitializedOriginsInternal.RemoveElement(aOriginMetadata.mOrigin);
} }
for (Client::Type type : AllClientTypes()) { for (Client::Type type : AllClientTypes()) {
(*mClients)[type]->OnOriginClearCompleted(aPersistenceType, aOrigin); (*mClients)[type]->OnOriginClearCompleted(aOriginMetadata);
} }
} else { } else {
(*mClients)[aClientType.Value()]->OnOriginClearCompleted(aPersistenceType, (*mClients)[aClientType.Value()]->OnOriginClearCompleted(aOriginMetadata);
aOrigin);
} }
} }
@@ -7002,8 +7001,7 @@ void QuotaManager::ClearOrigins(
} }
for (const auto& clearedOrigin : clearedOrigins) { for (const auto& clearedOrigin : clearedOrigins) {
OriginClearCompleted(clearedOrigin.mPersistenceType, clearedOrigin.mOrigin, OriginClearCompleted(clearedOrigin, Nullable<Client::Type>());
Nullable<Client::Type>());
} }
} }

4
dom/quota/Client.h
View File

@@ -146,8 +146,8 @@ class Client {
return NS_OK; return NS_OK;
} }
virtual void OnOriginClearCompleted(PersistenceType aPersistenceType, virtual void OnOriginClearCompleted(
const nsACString& aOrigin) = 0; const OriginMetadata& aOriginMetadata) = 0;
virtual void OnRepositoryClearCompleted(PersistenceType aPersistenceType) = 0; virtual void OnRepositoryClearCompleted(PersistenceType aPersistenceType) = 0;

15
dom/quota/OriginOperations.cpp
View File

@@ -1248,8 +1248,8 @@ nsresult FinalizeOriginEvictionOp::DoDirectoryWork(
AUTO_PROFILER_LABEL("FinalizeOriginEvictionOp::DoDirectoryWork", OTHER); AUTO_PROFILER_LABEL("FinalizeOriginEvictionOp::DoDirectoryWork", OTHER);
for (const auto& lock : mLocks) { for (const auto& lock : mLocks) {
aQuotaManager.OriginClearCompleted( aQuotaManager.OriginClearCompleted(lock->OriginMetadata(),
lock->GetPersistenceType(), lock->Origin(), Nullable<Client::Type>()); Nullable<Client::Type>());
} }
return NS_OK; return NS_OK;
@@ -2802,8 +2802,8 @@ void ClearRequestBase::DeleteFilesInternal(
aQuotaManager.RemoveQuotaForOrigin(aPersistenceType, metadata); aQuotaManager.RemoveQuotaForOrigin(aPersistenceType, metadata);
} }
aQuotaManager.OriginClearCompleted( aQuotaManager.OriginClearCompleted(metadata,
aPersistenceType, metadata.mOrigin, Nullable<Client::Type>()); Nullable<Client::Type>());
break; break;
} }
@@ -2840,8 +2840,8 @@ void ClearRequestBase::DeleteFilesInternal(
aQuotaManager.RemoveQuotaForOrigin(aPersistenceType, metadata); aQuotaManager.RemoveQuotaForOrigin(aPersistenceType, metadata);
aQuotaManager.OriginClearCompleted( aQuotaManager.OriginClearCompleted(metadata,
aPersistenceType, metadata.mOrigin, Nullable<Client::Type>()); Nullable<Client::Type>());
break; break;
} }
@@ -3036,8 +3036,7 @@ void ClearClientOp::DeleteFiles(const ClientMetadata& aClientMetadata) {
mQuotaManager->ResetUsageForClient(aClientMetadata); mQuotaManager->ResetUsageForClient(aClientMetadata);
} }
mQuotaManager->OriginClearCompleted(aClientMetadata.mPersistenceType, mQuotaManager->OriginClearCompleted(aClientMetadata,
aClientMetadata.mOrigin,
Nullable(aClientMetadata.mClientType)); Nullable(aClientMetadata.mClientType));
} }

3
dom/quota/QuotaManager.h
View File

@@ -543,8 +543,7 @@ class QuotaManager final : public BackgroundThreadObject {
const OriginScope& aOriginScope, const OriginScope& aOriginScope,
const Nullable<Client::Type>& aClientType); const Nullable<Client::Type>& aClientType);
void OriginClearCompleted(PersistenceType aPersistenceType, void OriginClearCompleted(const OriginMetadata& aOriginMetadata,
const nsACString& aOrigin,
const Nullable<Client::Type>& aClientType); const Nullable<Client::Type>& aClientType);
void RepositoryClearCompleted(PersistenceType aPersistenceType); void RepositoryClearCompleted(PersistenceType aPersistenceType);

7
dom/simpledb/ActorsParent.cpp
View File

@@ -474,8 +474,7 @@ class QuotaClient final : public mozilla::dom::quota::Client {
PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata, PersistenceType aPersistenceType, const OriginMetadata& aOriginMetadata,
const AtomicBool& aCanceled) override; const AtomicBool& aCanceled) override;
void OnOriginClearCompleted(PersistenceType aPersistenceType, void OnOriginClearCompleted(const OriginMetadata& aOriginMetadata) override;
const nsACString& aOrigin) override;
void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override; void OnRepositoryClearCompleted(PersistenceType aPersistenceType) override;
@@ -1730,8 +1729,8 @@ Result<UsageInfo, nsresult> QuotaClient::GetUsageForOrigin(
})); }));
} }
void QuotaClient::OnOriginClearCompleted(PersistenceType aPersistenceType, void QuotaClient::OnOriginClearCompleted(
const nsACString& aOrigin) { const OriginMetadata& aOriginMetadata) {
AssertIsOnIOThread(); AssertIsOnIOThread();
} }