mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 12:55:46 +00:00
Backed out changeset 20571bff3967 (bug 1389561). r=backout a=backout
MozReview-Commit-ID: 8GLZx2ls2C4
This commit is contained in:
parent
e88a2e98d9
commit
de06e62bd1
@ -3838,13 +3838,6 @@ QuotaManager::GetQuotaObject(PersistenceType aPersistenceType,
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#if defined(NIGHTLY_BUILD)
|
||||
{
|
||||
MutexAutoLock autoLock(mQuotaMutex);
|
||||
MOZ_DIAGNOSTIC_ASSERT(mTemporaryStorageInitialized);
|
||||
}
|
||||
#endif
|
||||
|
||||
nsString path;
|
||||
nsresult rv = aFile->GetPath(path);
|
||||
NS_ENSURE_SUCCESS(rv, nullptr);
|
||||
@ -3930,13 +3923,6 @@ QuotaManager::GetQuotaObject(PersistenceType aPersistenceType,
|
||||
{
|
||||
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
||||
|
||||
#if defined(NIGHTLY_BUILD)
|
||||
if (aPersistenceType != PERSISTENCE_TYPE_PERSISTENT){
|
||||
MutexAutoLock autoLock(mQuotaMutex);
|
||||
MOZ_DIAGNOSTIC_ASSERT(mTemporaryStorageInitialized);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (aFileSizeOut) {
|
||||
*aFileSizeOut = 0;
|
||||
}
|
||||
@ -5256,14 +5242,7 @@ QuotaManager::EnsureOriginIsInitializedInternal(
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
#if defined(NIGHTLY_BUILD)
|
||||
{
|
||||
MutexAutoLock autoLock(mQuotaMutex);
|
||||
mTemporaryStorageInitialized = true;
|
||||
}
|
||||
#else
|
||||
mTemporaryStorageInitialized = true;
|
||||
#endif
|
||||
|
||||
CheckTemporaryStorageLimits();
|
||||
}
|
||||
@ -5349,16 +5328,7 @@ QuotaManager::ResetOrClearCompleted()
|
||||
AssertIsOnIOThread();
|
||||
|
||||
mInitializedOrigins.Clear();
|
||||
|
||||
#if defined(NIGHTLY_BUILD)
|
||||
{
|
||||
MutexAutoLock autoLock(mQuotaMutex);
|
||||
mTemporaryStorageInitialized = false;
|
||||
}
|
||||
#else
|
||||
mTemporaryStorageInitialized = false;
|
||||
#endif
|
||||
|
||||
mTemporaryStorageInitialized = false;
|
||||
mStorageInitialized = false;
|
||||
|
||||
ReleaseIOThreadObjects();
|
||||
|
Loading…
Reference in New Issue
Block a user