Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 09:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1855142 - Move the persistence type assertion from FactoryOp::CheckPermission to FactoryOp::Open; r=dom-storage-reviewers,jari

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D189747
This commit is contained in:
Jan Varga 2024-02-07 17:48:40 +00:00
parent 68099bd158
commit fddcb701dc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/indexedDB/ActorsParent.cpp
View File

@ -14548,6 +14548,12 @@ nsresult FactoryOp::Open() {
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
}
const PrincipalInfo& principalInfo = mCommonParams.principalInfo();
if (principalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
MOZ_ASSERT(mCommonParams.metadata().persistenceType() ==
PERSISTENCE_TYPE_PERSISTENT);
}
QM_TRY_INSPECT(const auto& permission, CheckPermission());
MOZ_ASSERT(permission == PermissionValue::kPermissionAllowed ||
@ -14728,13 +14734,10 @@ Result<PermissionValue, nsresult> FactoryOp::CheckPermission() {
}
}
PersistenceType persistenceType = mCommonParams.metadata().persistenceType();
MOZ_ASSERT(principalInfo.type() != PrincipalInfo::TNullPrincipalInfo);
if (principalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
MOZ_ASSERT(mState == State::Initial);
MOZ_ASSERT(persistenceType == PERSISTENCE_TYPE_PERSISTENT);
return PermissionValue::kPermissionAllowed;
}
@ -14743,7 +14746,7 @@ Result<PermissionValue, nsresult> FactoryOp::CheckPermission() {
QM_TRY_INSPECT(
const auto& permission,
([persistenceType,
([persistenceType = mCommonParams.metadata().persistenceType(),
origin = QuotaManager::GetOriginFromValidatedPrincipalInfo(
principalInfo)]() -> mozilla::Result<PermissionValue, nsresult> {
if (persistenceType == PERSISTENCE_TYPE_PERSISTENT) {