Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1842350 - Remove OriginOperationBase::mNeedsStorageInit; r=dom-storage-reviewers,asuth

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D183072
This commit is contained in:
Jan Varga 2023-07-14 09:51:15 +00:00
parent 3b056ad093
commit 71880be19d
3 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/quota/OriginOperationBase.cpp
View File

@ -116,10 +116,6 @@ nsresult OriginOperationBase::DirectoryWork() {
QuotaManager* const quotaManager = QuotaManager::Get();
QM_TRY(OkIf(quotaManager), NS_ERROR_FAILURE);
if (mNeedsStorageInit) {
QM_TRY(MOZ_TO_RESULT(quotaManager->EnsureStorageIsInitialized()));
}
QM_TRY(MOZ_TO_RESULT(DoDirectoryWork(*quotaManager)));
// Must set mState before dispatching otherwise we will race with the owning

6
dom/quota/OriginOperationBase.h
View File

@ -45,9 +45,6 @@ class OriginOperationBase : public BackgroundThreadObject, public Runnable {
State mState;
bool mActorDestroyed;
protected:
bool mNeedsStorageInit;
public:
void NoteActorDestroyed() {
AssertIsOnOwningThread();
@ -77,8 +74,7 @@ class OriginOperationBase : public BackgroundThreadObject, public Runnable {
Runnable(aRunnableName),
mResultCode(NS_OK),
mState(State_Initial),
mActorDestroyed(false),
mNeedsStorageInit(false) {}
mActorDestroyed(false) {}
// Reference counted.
virtual ~OriginOperationBase() {

27
dom/quota/OriginOperations.cpp
View File

@ -935,9 +935,6 @@ GetOriginUsageOp::GetOriginUsageOp(const UsageRequestParams& aParams)
AssertIsOnOwningThread();
MOZ_ASSERT(aParams.type() == UsageRequestParams::TOriginUsageParams);
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = true;
// Overwrite GetOriginUsageOp default values.
mFromMemory = mParams.fromMemory();
}
@ -1031,9 +1028,6 @@ void GetOriginUsageOp::GetResponse(UsageRequestResponse& aResponse) {
StorageNameOp::StorageNameOp()
: QuotaRequestBase("dom::quota::StorageNameOp", /* aExclusive */ false) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
}
RefPtr<DirectoryLock> StorageNameOp::CreateDirectoryLock() { return nullptr; }
@ -1062,9 +1056,6 @@ InitializedRequestBase::InitializedRequestBase(const char* aRunnableName)
: QuotaRequestBase(aRunnableName, /* aExclusive */ false),
mInitialized(false) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
}
RefPtr<DirectoryLock> InitializedRequestBase::CreateDirectoryLock() {
@ -1115,9 +1106,6 @@ void TemporaryStorageInitializedOp::GetResponse(RequestResponse& aResponse) {
InitOp::InitOp()
: QuotaRequestBase("dom::quota::InitOp", /* aExclusive */ false) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
}
nsresult InitOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
@ -1140,9 +1128,6 @@ InitTemporaryStorageOp::InitTemporaryStorageOp()
: QuotaRequestBase("dom::quota::InitTemporaryStorageOp",
/* aExclusive */ false) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
}
nsresult InitTemporaryStorageOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
@ -1172,9 +1157,6 @@ InitializeOriginRequestBase::InitializeOriginRequestBase(
mCreated(false) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
// Overwrite NormalOriginOperationBase default values.
mPersistenceType.SetValue(aPersistenceType);
}
@ -1333,9 +1315,6 @@ ResetOrClearOp::ResetOrClearOp(bool aClear)
: QuotaRequestBase("dom::quota::ResetOrClearOp", /* aExclusive */ true),
mClear(aClear) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
}
void ResetOrClearOp::DeleteFiles(QuotaManager& aQuotaManager) {
@ -1701,9 +1680,6 @@ ResetOriginOp::ResetOriginOp(const RequestParams& aParams)
const auto origin =
QuotaManager::GetOriginFromValidatedPrincipalInfo(params.principalInfo());
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = false;
// Overwrite NormalOriginOperationBase default values.
if (params.persistenceTypeIsExplicit()) {
mPersistenceType.SetValue(params.persistenceType());
@ -1906,9 +1882,6 @@ EstimateOp::EstimateOp(const EstimateParams& aParams)
: QuotaRequestBase("dom::quota::EstimateOp", /* aExclusive */ false),
mParams(aParams) {
AssertIsOnOwningThread();
// Overwrite OriginOperationBase default values.
mNeedsStorageInit = true;
}
nsresult EstimateOp::DoInit(QuotaManager& aQuotaManager) {