mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1749504 - Make sure storage is initialized before clearing storage; r=dom-storage-reviewers,jstutte
LoadArchivedOrigins (called from QuotaClient::AboutToClearOrigins) currently ensures that storage is initialized which eventually creates the archive from webappsstore.sqlite. Conceptually, storage should be always initialized before QuotaClient::AboutToClearOrigins is called. Changes done in this patch: - removed QuotaManager::EnsureStorageIsInitializedInternal call from LoadArchivedOrigins - added QuotaManger::EnsureStorageIsInitializedInternal call to ClearStorageOp::DoDirectoryWork Differential Revision: https://phabricator.services.mozilla.com/D186115
This commit is contained in:
parent
264e43bd13
commit
e048ae910a
@ -2846,9 +2846,6 @@ nsresult LoadArchivedOrigins() {
|
||||
QuotaManager* quotaManager = QuotaManager::Get();
|
||||
MOZ_ASSERT(quotaManager);
|
||||
|
||||
// Ensure that the webappsstore.sqlite is moved to new place.
|
||||
QM_TRY(MOZ_TO_RESULT(quotaManager->EnsureStorageIsInitializedInternal()));
|
||||
|
||||
QM_TRY_INSPECT(const auto& connection, CreateArchiveStorageConnection(
|
||||
quotaManager->GetStoragePath()));
|
||||
|
||||
|
@ -1609,6 +1609,8 @@ nsresult ClearStorageOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
|
||||
|
||||
AUTO_PROFILER_LABEL("ClearStorageOp::DoDirectoryWork", OTHER);
|
||||
|
||||
QM_TRY(MOZ_TO_RESULT(aQuotaManager.EnsureStorageIsInitializedInternal()));
|
||||
|
||||
DeleteFiles(aQuotaManager);
|
||||
|
||||
aQuotaManager.RemoveQuota();
|
||||
|
Loading…
Reference in New Issue
Block a user