1 diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
2 index 1118ece64..ac8e28828 100644
3 --- a/dom/indexedDB/ActorsParent.cpp
4 +++ b/dom/indexedDB/ActorsParent.cpp
5 @@ -11529,7 +11529,7 @@ AutoSavepoint::~AutoSavepoint()
6 MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE ||
7 mDEBUGTransaction->GetMode() ==
8 IDBTransaction::READ_WRITE_FLUSH ||
9 - mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP ||
10 + mDEBUGTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
11 mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
13 if (NS_FAILED(mConnection->RollbackSavepoint())) {
14 @@ -11545,7 +11545,7 @@ AutoSavepoint::Start(const TransactionBase* aTransaction)
15 MOZ_ASSERT(aTransaction);
16 MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE ||
17 aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
18 - aTransaction->GetMode() == IDBTransaction::CLEANUP ||
19 + aTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
20 aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
22 DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
23 @@ -14692,7 +14692,7 @@ Database::AllocPBackgroundIDBTransactionParent(
24 if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY &&
25 aMode != IDBTransaction::READ_WRITE &&
26 aMode != IDBTransaction::READ_WRITE_FLUSH &&
27 - aMode != IDBTransaction::CLEANUP)) {
28 + aMode != IDBTransaction::IDB_MODE_CLEANUP)) {
29 ASSERT_UNLESS_FUZZING();
32 @@ -14701,7 +14701,7 @@ Database::AllocPBackgroundIDBTransactionParent(
34 if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE ||
35 aMode == IDBTransaction::READ_WRITE_FLUSH ||
36 - aMode == IDBTransaction::CLEANUP) &&
37 + aMode == IDBTransaction::IDB_MODE_CLEANUP) &&
38 mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo &&
39 !mChromeWriteAccessAllowed)) {
41 @@ -14767,7 +14767,7 @@ Database::RecvPBackgroundIDBTransactionConstructor(
42 MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY ||
43 aMode == IDBTransaction::READ_WRITE ||
44 aMode == IDBTransaction::READ_WRITE_FLUSH ||
45 - aMode == IDBTransaction::CLEANUP);
46 + aMode == IDBTransaction::IDB_MODE_CLEANUP);
49 if (IsInvalidated()) {
50 @@ -14926,7 +14926,7 @@ StartTransactionOp::DoDatabaseWork(DatabaseConnection* aConnection)
52 Transaction()->SetActiveOnConnectionThread();
54 - if (Transaction()->GetMode() == IDBTransaction::CLEANUP) {
55 + if (Transaction()->GetMode() == IDBTransaction::IDB_MODE_CLEANUP) {
56 nsresult rv = aConnection->DisableQuotaChecks();
57 if (NS_WARN_IF(NS_FAILED(rv))) {
59 @@ -15245,7 +15245,7 @@ TransactionBase::VerifyRequestParams(const RequestParams& aParams) const
60 case RequestParams::TObjectStoreDeleteParams: {
61 if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
62 mMode != IDBTransaction::READ_WRITE_FLUSH &&
63 - mMode != IDBTransaction::CLEANUP &&
64 + mMode != IDBTransaction::IDB_MODE_CLEANUP &&
65 mMode != IDBTransaction::VERSION_CHANGE)) {
66 ASSERT_UNLESS_FUZZING();
68 @@ -15269,7 +15269,7 @@ TransactionBase::VerifyRequestParams(const RequestParams& aParams) const
69 case RequestParams::TObjectStoreClearParams: {
70 if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
71 mMode != IDBTransaction::READ_WRITE_FLUSH &&
72 - mMode != IDBTransaction::CLEANUP &&
73 + mMode != IDBTransaction::IDB_MODE_CLEANUP &&
74 mMode != IDBTransaction::VERSION_CHANGE)) {
75 ASSERT_UNLESS_FUZZING();
77 @@ -23959,7 +23959,7 @@ CommitOp::WriteAutoIncrementCounts()
78 mTransaction->AssertIsOnConnectionThread();
79 MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
80 mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
81 - mTransaction->GetMode() == IDBTransaction::CLEANUP ||
82 + mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
83 mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
85 const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
86 @@ -24027,7 +24027,7 @@ CommitOp::CommitOrRollbackAutoIncrementCounts()
87 mTransaction->AssertIsOnConnectionThread();
88 MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
89 mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
90 - mTransaction->GetMode() == IDBTransaction::CLEANUP ||
91 + mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
92 mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
94 nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
95 @@ -24161,7 +24161,7 @@ CommitOp::Run()
97 connection->FinishWriteTransaction();
99 - if (mTransaction->GetMode() == IDBTransaction::CLEANUP) {
100 + if (mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP) {
101 connection->DoIdleProcessing(/* aNeedsCheckpoint */ true);
103 connection->EnableQuotaChecks();
104 diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp
105 index e5d8913f9..4ef7e8c7c 100644
106 --- a/dom/indexedDB/IDBCursor.cpp
107 +++ b/dom/indexedDB/IDBCursor.cpp
108 @@ -696,7 +696,7 @@ IDBCursor::Update(JSContext* aCx, JS::Handle<JS::Value> aValue,
112 - if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
113 + if (mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
116 mType == Type_ObjectStoreKey ||
117 diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
118 index 5592e7f93..49f18093d 100644
119 --- a/dom/indexedDB/IDBDatabase.cpp
120 +++ b/dom/indexedDB/IDBDatabase.cpp
121 @@ -668,7 +668,7 @@ IDBDatabase::Transaction(JSContext* aCx,
123 case IDBTransactionMode::Readwrite:
124 if (mQuotaExceeded) {
125 - mode = IDBTransaction::CLEANUP;
126 + mode = IDBTransaction::IDB_MODE_CLEANUP;
127 mQuotaExceeded = false;
129 mode = IDBTransaction::READ_WRITE;
130 @@ -678,7 +678,7 @@ IDBDatabase::Transaction(JSContext* aCx,
131 mode = IDBTransaction::READ_WRITE_FLUSH;
133 case IDBTransactionMode::Cleanup:
134 - mode = IDBTransaction::CLEANUP;
135 + mode = IDBTransaction::IDB_MODE_CLEANUP;
136 mQuotaExceeded = false;
138 case IDBTransactionMode::Versionchange:
139 @@ -713,7 +713,7 @@ IDBDatabase::Transaction(JSContext* aCx,
141 transaction->SetBackgroundActor(actor);
143 - if (mode == IDBTransaction::CLEANUP) {
144 + if (mode == IDBTransaction::IDB_MODE_CLEANUP) {
145 ExpireFileActors(/* aExpireAll */ true);
148 @@ -863,7 +863,7 @@ IDBDatabase::AbortTransactions(bool aShouldWarn)
149 // We warn for any transactions that could have written data.
150 case IDBTransaction::READ_WRITE:
151 case IDBTransaction::READ_WRITE_FLUSH:
152 - case IDBTransaction::CLEANUP:
153 + case IDBTransaction::IDB_MODE_CLEANUP:
154 case IDBTransaction::VERSION_CHANGE:
155 transactionsThatNeedWarning.AppendElement(transaction);
157 diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
158 index c28979c87..4694746cc 100644
159 --- a/dom/indexedDB/IDBObjectStore.cpp
160 +++ b/dom/indexedDB/IDBObjectStore.cpp
161 @@ -1406,7 +1406,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx,
163 MOZ_ASSERT_IF(aFromCursor, aOverwrite);
165 - if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
166 + if (mTransaction->GetMode() == IDBTransaction::IDB_MODE_CLEANUP ||
168 aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
170 diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
171 index a50489898..ef9d02414 100644
172 --- a/dom/indexedDB/IDBTransaction.cpp
173 +++ b/dom/indexedDB/IDBTransaction.cpp
174 @@ -216,7 +216,7 @@ IDBTransaction::Create(JSContext* aCx, IDBDatabase* aDatabase,
175 MOZ_ASSERT(aMode == READ_ONLY ||
176 aMode == READ_WRITE ||
177 aMode == READ_WRITE_FLUSH ||
179 + aMode == IDB_MODE_CLEANUP);
181 RefPtr<IDBTransaction> transaction =
182 new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
183 @@ -871,7 +871,7 @@ IDBTransaction::GetMode(ErrorResult& aRv) const
184 case READ_WRITE_FLUSH:
185 return IDBTransactionMode::Readwriteflush;
188 + case IDB_MODE_CLEANUP:
189 return IDBTransactionMode::Cleanup;
192 diff --git a/dom/indexedDB/IDBTransaction.h b/dom/indexedDB/IDBTransaction.h
193 index 1c3e8be99..4fc189902 100644
194 --- a/dom/indexedDB/IDBTransaction.h
195 +++ b/dom/indexedDB/IDBTransaction.h
196 @@ -59,7 +59,7 @@ public:
204 // Only needed for IPC serialization helper, should never be used in code.
205 @@ -189,7 +189,7 @@ public:
206 AssertIsOnOwningThread();
207 return mMode == READ_WRITE ||
208 mMode == READ_WRITE_FLUSH ||
209 - mMode == CLEANUP ||
210 + mMode == IDB_MODE_CLEANUP ||
211 mMode == VERSION_CHANGE;
214 diff --git a/dom/indexedDB/ProfilerHelpers.h b/dom/indexedDB/ProfilerHelpers.h
215 index 63fdafcce..b9192d5d6 100644
216 --- a/dom/indexedDB/ProfilerHelpers.h
217 +++ b/dom/indexedDB/ProfilerHelpers.h
218 @@ -129,7 +129,7 @@ public:
219 case IDBTransaction::READ_WRITE_FLUSH:
220 AppendLiteral("\"readwriteflush\"");
222 - case IDBTransaction::CLEANUP:
223 + case IDBTransaction::IDB_MODE_CLEANUP:
224 AppendLiteral("\"cleanup\"");
226 case IDBTransaction::VERSION_CHANGE: