mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1781201 - Rename GetDirectoryForOrigin/DeleteFilesForOrigin to GetOriginDirectory/DeleteOriginDirectory; r=hsingh 

This is a preparation for converting the arguments to a singe argument using
more generic OriginMetadata type.

The patch is partially based on D176751.

Differential Revision: https://phabricator.services.mozilla.com/D176867
This commit is contained in:
Jan Varga 2023-05-03 02:05:10 +00:00
Родитель 942e944f83
Коммит d283c67863
9 изменённых файлов: 44 добавлений и 46 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
dom/cache/QuotaClient.cpp поставляемый
Просмотреть файл

@ -181,7 +181,7 @@ Result<UsageInfo, nsresult> CacheQuotaClient::InitOrigin(
QM_TRY_INSPECT(
const auto& dir,
qm->GetDirectoryForOrigin(aPersistenceType, aOriginMetadata.mOrigin));
qm->GetOriginDirectory(aPersistenceType, aOriginMetadata.mOrigin));
QM_TRY(MOZ_TO_RESULT(
dir->Append(NS_LITERAL_STRING_FROM_CSTRING(DOMCACHE_DIRECTORY_NAME))));

2
dom/fs/parent/datamodel/FileSystemFileManager.cpp
Просмотреть файл

@ -159,7 +159,7 @@ Result<nsCOMPtr<nsIFile>, QMResult> GetFileSystemDirectory(
MOZ_ASSERT(quotaManager);
QM_TRY_UNWRAP(nsCOMPtr<nsIFile> fileSystemDirectory,
QM_TO_RESULT_TRANSFORM(quotaManager->GetDirectoryForOrigin(
QM_TO_RESULT_TRANSFORM(quotaManager->GetOriginDirectory(
quota::PERSISTENCE_TYPE_DEFAULT, aOrigin)));
QM_TRY(QM_TO_RESULT(fileSystemDirectory->AppendRelativePath(

8
dom/indexedDB/ActorsParent.cpp
Просмотреть файл

@ -12581,8 +12581,8 @@ Result<nsCOMPtr<nsIFile>, nsresult> QuotaClient::GetDirectory(
QuotaManager* const quotaManager = QuotaManager::Get();
NS_ASSERTION(quotaManager, "This should never fail!");
QM_TRY_INSPECT(const auto& directory, quotaManager->GetDirectoryForOrigin(
aPersistenceType, aOrigin));
QM_TRY_INSPECT(const auto& directory,
quotaManager->GetOriginDirectory(aPersistenceType, aOrigin));
MOZ_ASSERT(directory);
@ -14964,7 +14964,7 @@ nsresult FactoryOp::FinishOpen() {
([this, quotaManager,
persistenceType]() -> mozilla::Result<nsString, nsresult> {
QM_TRY_INSPECT(const auto& dbFile,
quotaManager->GetDirectoryForOrigin(
quotaManager->GetOriginDirectory(
persistenceType, mOriginMetadata.mOrigin));
QM_TRY(MOZ_TO_RESULT(dbFile->Append(
@ -16352,7 +16352,7 @@ nsresult DeleteDatabaseOp::DoDatabaseWork() {
QuotaManager* const quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
QM_TRY_UNWRAP(auto directory, quotaManager->GetDirectoryForOrigin(
QM_TRY_UNWRAP(auto directory, quotaManager->GetOriginDirectory(
persistenceType, mOriginMetadata.mOrigin));
QM_TRY(MOZ_TO_RESULT(

12
dom/localstorage/ActorsParent.cpp
Просмотреть файл

@ -4016,9 +4016,9 @@ nsresult Connection::EnsureStorageConnection() {
MOZ_ASSERT(quotaManager);
if (!mDatabaseWasNotAvailable || mHasCreatedDatabase) {
QM_TRY_INSPECT(const auto& directoryEntry,
quotaManager->GetDirectoryForOrigin(PERSISTENCE_TYPE_DEFAULT,
Origin()));
QM_TRY_INSPECT(
const auto& directoryEntry,
quotaManager->GetOriginDirectory(PERSISTENCE_TYPE_DEFAULT, Origin()));
QM_TRY(MOZ_TO_RESULT(directoryEntry->Append(
NS_LITERAL_STRING_FROM_CSTRING(LS_DIRECTORY_NAME))));
@ -6954,7 +6954,7 @@ nsresult PrepareDatastoreOp::DatabaseWork() {
}
QM_TRY_UNWRAP(auto directoryEntry,
quotaManager->GetDirectoryForOrigin(
quotaManager->GetOriginDirectory(
PERSISTENCE_TYPE_DEFAULT, Origin()));
quotaManager->EnsureQuotaForOrigin(mOriginMetadata);
@ -8304,8 +8304,8 @@ Result<UsageInfo, nsresult> QuotaClient::InitOrigin(
MOZ_ASSERT(quotaManager);
QM_TRY_INSPECT(const auto& directory,
quotaManager->GetDirectoryForOrigin(aPersistenceType,
aOriginMetadata.mOrigin));
quotaManager->GetOriginDirectory(aPersistenceType,
aOriginMetadata.mOrigin));
MOZ_ASSERT(directory);

52
dom/quota/ActorsParent.cpp
Просмотреть файл

@ -1704,8 +1704,8 @@ Result<bool, nsresult> MaybeUpdateLastAccessTimeForOrigin(
QM_TRY_INSPECT(
const auto& metadataFile,
quotaManager->GetDirectoryForOrigin(
aFullOriginMetadata.mPersistenceType, aFullOriginMetadata.mOrigin));
quotaManager->GetOriginDirectory(aFullOriginMetadata.mPersistenceType,
aFullOriginMetadata.mOrigin));
QM_TRY(MOZ_TO_RESULT(
metadataFile->Append(nsLiteralString(METADATA_V2_FILE_NAME))));
@ -3910,8 +3910,8 @@ nsresult QuotaManager::LoadQuota() {
if (accessed) {
QM_TRY_INSPECT(
const auto& directory,
GetDirectoryForOrigin(fullOriginMetadata.mPersistenceType,
fullOriginMetadata.mOrigin));
GetOriginDirectory(fullOriginMetadata.mPersistenceType,
fullOriginMetadata.mOrigin));
QM_TRY_INSPECT(const bool& exists,
MOZ_TO_RESULT_INVOKE_MEMBER(directory, Exists));
@ -4176,8 +4176,7 @@ already_AddRefed<QuotaObject> QuotaManager::GetQuotaObject(
{
QM_TRY_INSPECT(
const auto& directory,
GetDirectoryForOrigin(aPersistenceType, aOriginMetadata.mOrigin),
nullptr);
GetOriginDirectory(aPersistenceType, aOriginMetadata.mOrigin), nullptr);
nsAutoString clientType;
QM_TRY(OkIf(Client::TypeToText(aClientType, clientType, fallible)),
@ -4347,7 +4346,7 @@ void QuotaManager::AbortOperationsForProcess(ContentParentId aContentParentId) {
}
}
Result<nsCOMPtr<nsIFile>, nsresult> QuotaManager::GetDirectoryForOrigin(
Result<nsCOMPtr<nsIFile>, nsresult> QuotaManager::GetOriginDirectory(
PersistenceType aPersistenceType, const nsACString& aASCIIOrigin) const {
QM_TRY_UNWRAP(auto directory,
QM_NewLocalFile(GetStoragePath(aPersistenceType)));
@ -5942,8 +5941,8 @@ QuotaManager::EnsurePersistentOriginIsInitialized(
this](const auto& firstInitializationAttempt)
-> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
QM_TRY_UNWRAP(auto directory,
GetDirectoryForOrigin(PERSISTENCE_TYPE_PERSISTENT,
aOriginMetadata.mOrigin));
GetOriginDirectory(PERSISTENCE_TYPE_PERSISTENT,
aOriginMetadata.mOrigin));
if (mInitializedOrigins.Contains(aOriginMetadata.mOrigin)) {
MOZ_ASSERT(firstInitializationAttempt.Recorded());
@ -6003,9 +6002,8 @@ QuotaManager::EnsureTemporaryOriginIsInitialized(
this](const auto&)
-> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
// Get directory for this origin and persistence type.
QM_TRY_UNWRAP(
auto directory,
GetDirectoryForOrigin(aPersistenceType, aOriginMetadata.mOrigin));
QM_TRY_UNWRAP(auto directory, GetOriginDirectory(aPersistenceType,
aOriginMetadata.mOrigin));
QM_TRY_INSPECT(const bool& created, EnsureOriginDirectory(*directory));
@ -6900,8 +6898,8 @@ void QuotaManager::ClearOrigins(
break;
}
DeleteFilesForOrigin(doomedOriginInfo->mGroupInfo->mPersistenceType,
doomedOriginInfo->mOrigin);
DeleteOriginDirectory(doomedOriginInfo->mGroupInfo->mPersistenceType,
doomedOriginInfo->mOrigin);
clearedOrigins.AppendElement(doomedOriginInfo->FlattenToOriginMetadata());
}
@ -6935,10 +6933,10 @@ void QuotaManager::CleanupTemporaryStorage() {
}
}
void QuotaManager::DeleteFilesForOrigin(PersistenceType aPersistenceType,
const nsACString& aOrigin) {
void QuotaManager::DeleteOriginDirectory(PersistenceType aPersistenceType,
const nsACString& aOrigin) {
QM_TRY_INSPECT(const auto& directory,
GetDirectoryForOrigin(aPersistenceType, aOrigin), QM_VOID);
GetOriginDirectory(aPersistenceType, aOrigin), QM_VOID);
nsresult rv = directory->Remove(true);
if (rv != NS_ERROR_FILE_NOT_FOUND && NS_FAILED(rv)) {
@ -7003,8 +7001,8 @@ Result<Ok, nsresult> QuotaManager::ArchiveOrigins(
IsBestEffortPersistenceType(fullOriginMetadata.mPersistenceType));
QM_TRY_INSPECT(const auto& directory,
GetDirectoryForOrigin(fullOriginMetadata.mPersistenceType,
fullOriginMetadata.mOrigin));
GetOriginDirectory(fullOriginMetadata.mPersistenceType,
fullOriginMetadata.mOrigin));
// The origin could have been removed, for example due to corruption.
QM_TRY_INSPECT(
@ -7396,8 +7394,8 @@ nsresult SaveOriginAccessTimeOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
AUTO_PROFILER_LABEL("SaveOriginAccessTimeOp::DoDirectoryWork", OTHER);
QM_TRY_INSPECT(const auto& file,
aQuotaManager.GetDirectoryForOrigin(mPersistenceType.Value(),
mOriginScope.GetOrigin()));
aQuotaManager.GetOriginDirectory(mPersistenceType.Value(),
mOriginScope.GetOrigin()));
// The origin directory might not exist
// anymore, because it was deleted by a clear operation.
@ -8034,8 +8032,8 @@ Result<UsageInfo, nsresult> QuotaUsageRequestBase::GetUsageForOrigin(
AssertIsOnIOThread();
QM_TRY_INSPECT(const auto& directory,
aQuotaManager.GetDirectoryForOrigin(aPersistenceType,
aOriginMetadata.mOrigin));
aQuotaManager.GetOriginDirectory(aPersistenceType,
aOriginMetadata.mOrigin));
QM_TRY_INSPECT(const bool& exists,
MOZ_TO_RESULT_INVOKE_MEMBER(directory, Exists));
@ -9251,8 +9249,8 @@ nsresult PersistedOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
// Try to get the persisted flag from directory metadata on disk.
QM_TRY_INSPECT(const auto& directory,
aQuotaManager.GetDirectoryForOrigin(mPersistenceType.Value(),
mOriginScope.GetOrigin()));
aQuotaManager.GetOriginDirectory(mPersistenceType.Value(),
mOriginScope.GetOrigin()));
QM_TRY_INSPECT(const bool& exists,
MOZ_TO_RESULT_INVOKE_MEMBER(directory, Exists));
@ -9301,8 +9299,8 @@ nsresult PersistOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
// Update directory metadata on disk first. Then, create/update the originInfo
// if needed.
QM_TRY_INSPECT(const auto& directory,
aQuotaManager.GetDirectoryForOrigin(mPersistenceType.Value(),
originMetadata.mOrigin));
aQuotaManager.GetOriginDirectory(mPersistenceType.Value(),
originMetadata.mOrigin));
QM_TRY_INSPECT(const bool& created,
aQuotaManager.EnsureOriginDirectory(*directory));

4
dom/quota/CanonicalQuotaObject.cpp
Просмотреть файл

@ -235,8 +235,8 @@ bool CanonicalQuotaObject::LockedMaybeUpdateSize(int64_t aSize,
MutexAutoUnlock autoUnlock(quotaManager->mQuotaMutex);
for (const auto& lock : locks) {
quotaManager->DeleteFilesForOrigin(lock->GetPersistenceType(),
lock->Origin());
quotaManager->DeleteOriginDirectory(lock->GetPersistenceType(),
lock->Origin());
}
}

6
dom/quota/QuotaManager.h
Просмотреть файл

@ -230,7 +230,7 @@ class QuotaManager final : public BackgroundThreadObject {
// for the given process.
void AbortOperationsForProcess(ContentParentId aContentParentId);
Result<nsCOMPtr<nsIFile>, nsresult> GetDirectoryForOrigin(
Result<nsCOMPtr<nsIFile>, nsresult> GetOriginDirectory(
PersistenceType aPersistenceType, const nsACString& aASCIIOrigin) const;
nsresult RestoreDirectoryMetadata2(nsIFile* aDirectory);
@ -558,8 +558,8 @@ class QuotaManager final : public BackgroundThreadObject {
void CleanupTemporaryStorage();
void DeleteFilesForOrigin(PersistenceType aPersistenceType,
const nsACString& aOrigin);
void DeleteOriginDirectory(PersistenceType aPersistenceType,
const nsACString& aOrigin);
void FinalizeOriginEviction(nsTArray<RefPtr<OriginDirectoryLock>>&& aLocks);

2
dom/quota/test/gtest/TestFileOutputStream.cpp
Просмотреть файл

@ -71,7 +71,7 @@ TEST_F(TestFileOutputStream, extendFileStreamWithSetEOF) {
quota::Client::Type::SDB);
{
auto testPathRes = quotaManager->GetDirectoryForOrigin(
auto testPathRes = quotaManager->GetOriginDirectory(
quota::PERSISTENCE_TYPE_DEFAULT, originMetadata.mOrigin);
ASSERT_TRUE(testPathRes.isOk());

2
dom/simpledb/ActorsParent.cpp
Просмотреть файл

@ -1683,7 +1683,7 @@ Result<UsageInfo, nsresult> QuotaClient::GetUsageForOrigin(
QuotaManager* quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
QM_TRY_UNWRAP(auto directory, quotaManager->GetDirectoryForOrigin(
QM_TRY_UNWRAP(auto directory, quotaManager->GetOriginDirectory(
aPersistenceType, aOriginMetadata.mOrigin));
MOZ_ASSERT(directory);