From e6145149a7bc2d91c4c967a74b24b14b7b422a3f Mon Sep 17 00:00:00 2001 From: Tom Tung Date: Tue, 29 Aug 2017 19:14:19 +0800 Subject: [PATCH] Bug 1394745 - Modify the assertion to allow the QM to evict the origin in the different persistence type. r=janv --- dom/quota/ActorsParent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/quota/ActorsParent.cpp b/dom/quota/ActorsParent.cpp index 5ec1b6b61980..ad79c71d6c6f 100644 --- a/dom/quota/ActorsParent.cpp +++ b/dom/quota/ActorsParent.cpp @@ -3072,7 +3072,8 @@ QuotaObject::MaybeUpdateSize(int64_t aSize, bool aTruncate) MOZ_ASSERT(!lock->GetGroup().IsEmpty()); MOZ_ASSERT(lock->GetOriginScope().IsOrigin()); MOZ_ASSERT(!lock->GetOriginScope().GetOrigin().IsEmpty()); - MOZ_ASSERT(lock->GetOriginScope().GetOrigin() != mOriginInfo->mOrigin, + MOZ_ASSERT(!(lock->GetOriginScope().GetOrigin() == mOriginInfo->mOrigin && + lock->GetPersistenceType().Value() == groupInfo->mPersistenceType), "Deleted itself!"); quotaManager->LockedRemoveQuotaForOrigin(