--- /dev/null
+diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
+index 1118ece64..ac8e28828 100644
+--- a/dom/indexedDB/ActorsParent.cpp
++++ b/dom/indexedDB/ActorsParent.cpp
+@@ -11529,7 +11529,7 @@ AutoSavepoint::~AutoSavepoint()
+ MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ mDEBUGTransaction->GetMode() ==
+ IDBTransaction::READ_WRITE_FLUSH ||
+- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ mDEBUGTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
+ mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ if (NS_FAILED(mConnection->RollbackSavepoint())) {
+@@ -11545,7 +11545,7 @@ AutoSavepoint::Start(const TransactionBase* aTransaction)
+ MOZ_ASSERT(aTransaction);
+ MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+- aTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ aTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
+ aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
+@@ -14692,7 +14692,7 @@ Database::AllocPBackgroundIDBTransactionParent(
+ if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY &&
+ aMode != IDBTransaction::READ_WRITE &&
+ aMode != IDBTransaction::READ_WRITE_FLUSH &&
+- aMode != IDBTransaction::CLEANUP)) {
++ aMode != IDBTransaction::IDB_MODE_CLEANUP)) {
+ ASSERT_UNLESS_FUZZING();
+ return nullptr;
+ }
+@@ -14701,7 +14701,7 @@ Database::AllocPBackgroundIDBTransactionParent(
+ // has write access.
+ if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE ||
+ aMode == IDBTransaction::READ_WRITE_FLUSH ||
+- aMode == IDBTransaction::CLEANUP) &&
++ aMode == IDBTransaction::IDB_MODE_CLEANUP) &&
+ mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo &&
+ !mChromeWriteAccessAllowed)) {
+ return nullptr;
+@@ -14767,7 +14767,7 @@ Database::RecvPBackgroundIDBTransactionConstructor(
+ MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY ||
+ aMode == IDBTransaction::READ_WRITE ||
+ aMode == IDBTransaction::READ_WRITE_FLUSH ||
+- aMode == IDBTransaction::CLEANUP);
++ aMode == IDBTransaction::IDB_MODE_CLEANUP);
+ MOZ_ASSERT(!mClosed);
+
+ if (IsInvalidated()) {
+@@ -14926,7 +14926,7 @@ StartTransactionOp::DoDatabaseWork(DatabaseConnection* aConnection)
+
+ Transaction()->SetActiveOnConnectionThread();
+
+- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) {
++ if (Transaction()->GetMode() == IDBTransaction::IDB_MODE_CLEANUP) {
+ nsresult rv = aConnection->DisableQuotaChecks();
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+@@ -15245,7 +15245,7 @@ TransactionBase::VerifyRequestParams(const RequestParams& aParams) const
+ case RequestParams::TObjectStoreDeleteParams: {
+ if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
+ mMode != IDBTransaction::READ_WRITE_FLUSH &&
+- mMode != IDBTransaction::CLEANUP &&
++ mMode != IDBTransaction::IDB_MODE_CLEANUP &&
+ mMode != IDBTransaction::VERSION_CHANGE)) {
+ ASSERT_UNLESS_FUZZING();
+ return false;
+@@ -15269,7 +15269,7 @@ TransactionBase::VerifyRequestParams(const RequestParams& aParams) const
+ case RequestParams::TObjectStoreClearParams: {
+ if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
+ mMode != IDBTransaction::READ_WRITE_FLUSH &&
+- mMode != IDBTransaction::CLEANUP &&
++ mMode != IDBTransaction::IDB_MODE_CLEANUP &&
+ mMode != IDBTransaction::VERSION_CHANGE)) {
+ ASSERT_UNLESS_FUZZING();
+ return false;
+@@ -23959,7 +23959,7 @@ CommitOp::WriteAutoIncrementCounts()
+ mTransaction->AssertIsOnConnectionThread();
+ MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
+ mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
+@@ -24027,7 +24027,7 @@ CommitOp::CommitOrRollbackAutoIncrementCounts()
+ mTransaction->AssertIsOnConnectionThread();
+ MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+ mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
+ mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+
+ nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
+@@ -24161,7 +24161,7 @@ CommitOp::Run()
+
+ connection->FinishWriteTransaction();
+
+- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) {
++ if (mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP) {
+ connection->DoIdleProcessing(/* aNeedsCheckpoint */ true);
+
+ connection->EnableQuotaChecks();
+diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp
+index e5d8913f9..4ef7e8c7c 100644
+--- a/dom/indexedDB/IDBCursor.cpp
++++ b/dom/indexedDB/IDBCursor.cpp
+@@ -696,7 +696,7 @@ IDBCursor::Update(JSContext* aCx, JS::Handle<JS::Value> aValue,
+ return nullptr;
+ }
+
+- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ if (mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
+ IsSourceDeleted() ||
+ !mHaveValue ||
+ mType == Type_ObjectStoreKey ||
+diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
+index 5592e7f93..49f18093d 100644
+--- a/dom/indexedDB/IDBDatabase.cpp
++++ b/dom/indexedDB/IDBDatabase.cpp
+@@ -668,7 +668,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+ break;
+ case IDBTransactionMode::Readwrite:
+ if (mQuotaExceeded) {
+- mode = IDBTransaction::CLEANUP;
++ mode = IDBTransaction::IDB_MODE_CLEANUP;
+ mQuotaExceeded = false;
+ } else {
+ mode = IDBTransaction::READ_WRITE;
+@@ -678,7 +678,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+ mode = IDBTransaction::READ_WRITE_FLUSH;
+ break;
+ case IDBTransactionMode::Cleanup:
+- mode = IDBTransaction::CLEANUP;
++ mode = IDBTransaction::IDB_MODE_CLEANUP;
+ mQuotaExceeded = false;
+ break;
+ case IDBTransactionMode::Versionchange:
+@@ -713,7 +713,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+
+ transaction->SetBackgroundActor(actor);
+
+- if (mode == IDBTransaction::CLEANUP) {
++ if (mode == IDBTransaction::IDB_MODE_CLEANUP) {
+ ExpireFileActors(/* aExpireAll */ true);
+ }
+
+@@ -863,7 +863,7 @@ IDBDatabase::AbortTransactions(bool aShouldWarn)
+ // We warn for any transactions that could have written data.
+ case IDBTransaction::READ_WRITE:
+ case IDBTransaction::READ_WRITE_FLUSH:
+- case IDBTransaction::CLEANUP:
++ case IDBTransaction::IDB_MODE_CLEANUP:
+ case IDBTransaction::VERSION_CHANGE:
+ transactionsThatNeedWarning.AppendElement(transaction);
+ break;
+diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
+index c28979c87..4694746cc 100644
+--- a/dom/indexedDB/IDBObjectStore.cpp
++++ b/dom/indexedDB/IDBObjectStore.cpp
+@@ -1406,7 +1406,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx,
+ MOZ_ASSERT(aCx);
+ MOZ_ASSERT_IF(aFromCursor, aOverwrite);
+
+- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++ if (mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
+ mDeletedSpec) {
+ aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
+ return nullptr;
+diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
+index a50489898..ef9d02414 100644
+--- a/dom/indexedDB/IDBTransaction.cpp
++++ b/dom/indexedDB/IDBTransaction.cpp
+@@ -216,7 +216,7 @@ IDBTransaction::Create(JSContext* aCx, IDBDatabase* aDatabase,
+ MOZ_ASSERT(aMode == READ_ONLY ||
+ aMode == READ_WRITE ||
+ aMode == READ_WRITE_FLUSH ||
+- aMode == CLEANUP);
++ aMode == IDB_MODE_CLEANUP);
+
+ RefPtr<IDBTransaction> transaction =
+ new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
+@@ -871,7 +871,7 @@ IDBTransaction::GetMode(ErrorResult& aRv) const
+ case READ_WRITE_FLUSH:
+ return IDBTransactionMode::Readwriteflush;
+
+- case CLEANUP:
++ case IDB_MODE_CLEANUP:
+ return IDBTransactionMode::Cleanup;
+
+ case VERSION_CHANGE:
+diff --git a/dom/indexedDB/IDBTransaction.h b/dom/indexedDB/IDBTransaction.h
+index 1c3e8be99..4fc189902 100644
+--- a/dom/indexedDB/IDBTransaction.h
++++ b/dom/indexedDB/IDBTransaction.h
+@@ -59,7 +59,7 @@ public:
+ READ_ONLY = 0,
+ READ_WRITE,
+ READ_WRITE_FLUSH,
+- CLEANUP,
++ IDB_MODE_CLEANUP,
+ VERSION_CHANGE,
+
+ // Only needed for IPC serialization helper, should never be used in code.
+@@ -189,7 +189,7 @@ public:
+ AssertIsOnOwningThread();
+ return mMode == READ_WRITE ||
+ mMode == READ_WRITE_FLUSH ||
+- mMode == CLEANUP ||
++ mMode == IDB_MODE_CLEANUP ||
+ mMode == VERSION_CHANGE;
+ }
+
+diff --git a/dom/indexedDB/ProfilerHelpers.h b/dom/indexedDB/ProfilerHelpers.h
+index 63fdafcce..b9192d5d6 100644
+--- a/dom/indexedDB/ProfilerHelpers.h
++++ b/dom/indexedDB/ProfilerHelpers.h
+@@ -129,7 +129,7 @@ public:
+ case IDBTransaction::READ_WRITE_FLUSH:
+ AppendLiteral("\"readwriteflush\"");
+ break;
+- case IDBTransaction::CLEANUP:
++ case IDBTransaction::IDB_MODE_CLEANUP:
+ AppendLiteral("\"cleanup\"");
+ break;
+ case IDBTransaction::VERSION_CHANGE:
projects / gentoo-fixes.git / blobdiff