зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1619592 - Replace EnsureStorageAndOriginIsInitialized with EnsurePersistentOriginIsInitialized and EnsureTemporaryOriginIsInitialized in dom/simpledb; r=dom-workers-and-storage-reviewers,sg
Differential Revision: https://phabricator.services.mozilla.com/D97259
This commit is contained in:
Родитель
f9fdb2de2a
Коммит
113846d47d
|
@ -1201,9 +1201,23 @@ nsresult OpenOp::DatabaseWork() {
|
|||
QuotaManager* quotaManager = QuotaManager::Get();
|
||||
MOZ_ASSERT(quotaManager);
|
||||
|
||||
SDB_TRY_INSPECT(const auto& dbDirectory,
|
||||
quotaManager->EnsureStorageAndOriginIsInitialized(
|
||||
GetConnection()->GetPersistenceType(), mQuotaInfo));
|
||||
SDB_TRY(quotaManager->EnsureStorageIsInitialized());
|
||||
|
||||
SDB_TRY_INSPECT(
|
||||
const auto& dbDirectory,
|
||||
([persistenceType = GetConnection()->GetPersistenceType(), "aManager,
|
||||
this]()
|
||||
-> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
|
||||
if (persistenceType == PERSISTENCE_TYPE_PERSISTENT) {
|
||||
SDB_TRY_RETURN(
|
||||
quotaManager->EnsurePersistentOriginIsInitialized(mQuotaInfo));
|
||||
}
|
||||
|
||||
SDB_TRY(quotaManager->EnsureTemporaryStorageIsInitialized());
|
||||
SDB_TRY_RETURN(quotaManager->EnsureTemporaryOriginIsInitialized(
|
||||
persistenceType, mQuotaInfo));
|
||||
}()
|
||||
.map([](const auto& res) { return res.first; })));
|
||||
|
||||
nsresult rv =
|
||||
dbDirectory->Append(NS_LITERAL_STRING_FROM_CSTRING(SDB_DIRECTORY_NAME));
|
||||
|
|
Загрузка…
Ссылка в новой задаче