1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
--- seamonkey-2.53.7.1/dom/indexedDB/ActorsParent.cpp
+++ seamonkey-2.53.7.1/dom/indexedDB/ActorsParent.cpp
@@ -11381,7 +11381,7 @@ AutoSavepoint::~AutoSavepoint()
MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE ||
mDEBUGTransaction->GetMode() ==
IDBTransaction::READ_WRITE_FLUSH ||
- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ mDEBUGTransaction->GetMode() == IDBTransaction::CLEAN_UP ||
mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
if (NS_FAILED(mConnection->RollbackSavepoint())) {
@@ -11397,7 +11397,7 @@ AutoSavepoint::Start(const TransactionBa
MOZ_ASSERT(aTransaction);
MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE ||
aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
- aTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ aTransaction->GetMode() == IDBTransaction::CLEAN_UP ||
aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
@@ -14540,7 +14540,7 @@ Database::AllocPBackgroundIDBTransaction
if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY &&
aMode != IDBTransaction::READ_WRITE &&
aMode != IDBTransaction::READ_WRITE_FLUSH &&
- aMode != IDBTransaction::CLEANUP)) {
+ aMode != IDBTransaction::CLEAN_UP)) {
ASSERT_UNLESS_FUZZING();
return nullptr;
}
@@ -14549,7 +14549,7 @@ Database::AllocPBackgroundIDBTransaction
// has write access.
if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE ||
aMode == IDBTransaction::READ_WRITE_FLUSH ||
- aMode == IDBTransaction::CLEANUP) &&
+ aMode == IDBTransaction::CLEAN_UP) &&
mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo &&
!mChromeWriteAccessAllowed)) {
return nullptr;
@@ -14615,7 +14615,7 @@ Database::RecvPBackgroundIDBTransactionC
MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY ||
aMode == IDBTransaction::READ_WRITE ||
aMode == IDBTransaction::READ_WRITE_FLUSH ||
- aMode == IDBTransaction::CLEANUP);
+ aMode == IDBTransaction::CLEAN_UP);
MOZ_ASSERT(!mClosed);
if (IsInvalidated()) {
@@ -14778,7 +14778,7 @@ StartTransactionOp::DoDatabaseWork(Datab
Transaction()->SetActiveOnConnectionThread();
- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) {
+ if (Transaction()->GetMode() == IDBTransaction::CLEAN_UP) {
nsresult rv = aConnection->DisableQuotaChecks();
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
@@ -15097,7 +15097,7 @@ TransactionBase::VerifyRequestParams(con
case RequestParams::TObjectStoreDeleteParams: {
if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
mMode != IDBTransaction::READ_WRITE_FLUSH &&
- mMode != IDBTransaction::CLEANUP &&
+ mMode != IDBTransaction::CLEAN_UP &&
mMode != IDBTransaction::VERSION_CHANGE)) {
ASSERT_UNLESS_FUZZING();
return false;
@@ -15121,7 +15121,7 @@ TransactionBase::VerifyRequestParams(con
case RequestParams::TObjectStoreClearParams: {
if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
mMode != IDBTransaction::READ_WRITE_FLUSH &&
- mMode != IDBTransaction::CLEANUP &&
+ mMode != IDBTransaction::CLEAN_UP &&
mMode != IDBTransaction::VERSION_CHANGE)) {
ASSERT_UNLESS_FUZZING();
return false;
@@ -23880,7 +23880,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::CLEAN_UP ||
mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
@@ -23948,7 +23948,7 @@ CommitOp::CommitOrRollbackAutoIncrementC
mTransaction->AssertIsOnConnectionThread();
MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ mTransaction->GetMode() == IDBTransaction::CLEAN_UP ||
mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
@@ -24080,7 +24080,7 @@ CommitOp::Run()
connection->FinishWriteTransaction();
- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) {
+ if (mTransaction->GetMode() == IDBTransaction::CLEAN_UP) {
connection->DoIdleProcessing(/* aNeedsCheckpoint */ true);
connection->EnableQuotaChecks();
--- seamonkey-2.53.7.1/dom/indexedDB/IDBCursor.cpp
+++ seamonkey-2.53.7.1/dom/indexedDB/IDBCursor.cpp
@@ -686,7 +686,7 @@ IDBCursor::Update(JSContext* aCx, JS::Ha
return nullptr;
}
- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ if (mTransaction->GetMode() == IDBTransaction::CLEAN_UP ||
IsSourceDeleted() ||
!mHaveValue ||
mType == Type_ObjectStoreKey ||
--- seamonkey-2.53.7.1/dom/indexedDB/IDBDatabase.cpp
+++ seamonkey-2.53.7.1/dom/indexedDB/IDBDatabase.cpp
@@ -673,7 +673,7 @@ IDBDatabase::Transaction(JSContext* aCx,
break;
case IDBTransactionMode::Readwrite:
if (mQuotaExceeded) {
- mode = IDBTransaction::CLEANUP;
+ mode = IDBTransaction::CLEAN_UP;
mQuotaExceeded = false;
} else {
mode = IDBTransaction::READ_WRITE;
@@ -683,7 +683,7 @@ IDBDatabase::Transaction(JSContext* aCx,
mode = IDBTransaction::READ_WRITE_FLUSH;
break;
case IDBTransactionMode::Cleanup:
- mode = IDBTransaction::CLEANUP;
+ mode = IDBTransaction::CLEAN_UP;
mQuotaExceeded = false;
break;
case IDBTransactionMode::Versionchange:
@@ -717,7 +717,7 @@ IDBDatabase::Transaction(JSContext* aCx,
transaction->SetBackgroundActor(actor);
- if (mode == IDBTransaction::CLEANUP) {
+ if (mode == IDBTransaction::CLEAN_UP) {
ExpireFileActors(/* aExpireAll */ true);
}
@@ -870,7 +870,7 @@ IDBDatabase::AbortTransactions(bool aSho
// We warn for any transactions that could have written data.
case IDBTransaction::READ_WRITE:
case IDBTransaction::READ_WRITE_FLUSH:
- case IDBTransaction::CLEANUP:
+ case IDBTransaction::CLEAN_UP:
case IDBTransaction::VERSION_CHANGE:
transactionsThatNeedWarning.AppendElement(transaction);
break;
--- seamonkey-2.53.7.1/dom/indexedDB/IDBObjectStore.cpp
+++ seamonkey-2.53.7.1/dom/indexedDB/IDBObjectStore.cpp
@@ -1546,7 +1546,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx,
MOZ_ASSERT(aCx);
MOZ_ASSERT_IF(aFromCursor, aOverwrite);
- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ if (mTransaction->GetMode() == IDBTransaction::CLEAN_UP ||
mDeletedSpec) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
return nullptr;
--- seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.cpp
+++ seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.cpp
@@ -221,7 +221,7 @@ IDBTransaction::Create(JSContext* aCx, I
MOZ_ASSERT(aMode == READ_ONLY ||
aMode == READ_WRITE ||
aMode == READ_WRITE_FLUSH ||
- aMode == CLEANUP);
+ aMode == CLEAN_UP);
RefPtr<IDBTransaction> transaction =
new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
@@ -913,7 +913,7 @@ IDBTransaction::GetMode(ErrorResult& aRv
case READ_WRITE_FLUSH:
return IDBTransactionMode::Readwriteflush;
- case CLEANUP:
+ case CLEAN_UP:
return IDBTransactionMode::Cleanup;
case VERSION_CHANGE:
--- seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.h
+++ seamonkey-2.53.7.1/dom/indexedDB/IDBTransaction.h
@@ -59,7 +59,7 @@ public:
READ_ONLY = 0,
READ_WRITE,
READ_WRITE_FLUSH,
- CLEANUP,
+ CLEAN_UP,
VERSION_CHANGE,
// Only needed for IPC serialization helper, should never be used in code.
@@ -194,7 +194,7 @@ public:
AssertIsOnOwningThread();
return mMode == READ_WRITE ||
mMode == READ_WRITE_FLUSH ||
- mMode == CLEANUP ||
+ mMode == CLEAN_UP ||
mMode == VERSION_CHANGE;
}
--- seamonkey-2.53.7.1/dom/indexedDB/ProfilerHelpers.h
+++ seamonkey-2.53.7.1/dom/indexedDB/ProfilerHelpers.h
@@ -130,7 +130,7 @@ public:
case IDBTransaction::READ_WRITE_FLUSH:
AppendLiteral("\"readwriteflush\"");
break;
- case IDBTransaction::CLEANUP:
+ case IDBTransaction::CLEAN_UP:
AppendLiteral("\"cleanup\"");
break;
case IDBTransaction::VERSION_CHANGE:
|
