File mozilla-scoped-enums.patch of Package firefox-esr52-gtk2
--- mozilla/dom/indexedDB/ProfilerHelpers.h.orig 2022-08-29 19:01:55.487066510 -0700
+++ mozilla/dom/indexedDB/ProfilerHelpers.h 2022-08-29 19:02:53.731910685 -0700
@@ -120,19 +120,19 @@
Append(kCommaSpace);
switch (aTransaction->GetMode()) {
- case IDBTransaction::READ_ONLY:
+ case IDBTransaction::Mode::ReadOnly:
AppendLiteral("\"readonly\"");
break;
- case IDBTransaction::READ_WRITE:
+ case IDBTransaction::Mode::ReadWrite:
AppendLiteral("\"readwrite\"");
break;
- case IDBTransaction::READ_WRITE_FLUSH:
+ case IDBTransaction::Mode::ReadWriteFlush:
AppendLiteral("\"readwriteflush\"");
break;
- case IDBTransaction::CLEANUP:
+ case IDBTransaction::Mode::Cleanup:
AppendLiteral("\"cleanup\"");
break;
- case IDBTransaction::VERSION_CHANGE:
+ case IDBTransaction::Mode::VersionChange:
AppendLiteral("\"versionchange\"");
break;
default:
--- mozilla/dom/indexedDB/IDBDatabase.cpp.orig 2022-08-29 18:41:39.197131012 -0700
+++ mozilla/dom/indexedDB/IDBDatabase.cpp 2022-08-29 18:45:37.032678770 -0700
@@ -423,7 +423,7 @@
IDBTransaction* transaction = IDBTransaction::GetCurrent();
if (!transaction ||
transaction->Database() != this ||
- transaction->GetMode() != IDBTransaction::VERSION_CHANGE) {
+ transaction->GetMode() != IDBTransaction::Mode::VersionChange) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
return nullptr;
}
@@ -501,7 +501,7 @@
IDBTransaction* transaction = IDBTransaction::GetCurrent();
if (!transaction ||
transaction->Database() != this ||
- transaction->GetMode() != IDBTransaction::VERSION_CHANGE) {
+ transaction->GetMode() != IDBTransaction::Mode::VersionChange) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
return;
}
@@ -664,21 +664,21 @@
IDBTransaction::Mode mode;
switch (aMode) {
case IDBTransactionMode::Readonly:
- mode = IDBTransaction::READ_ONLY;
+ mode = IDBTransaction::Mode::ReadOnly;
break;
case IDBTransactionMode::Readwrite:
if (mQuotaExceeded) {
- mode = IDBTransaction::CLEANUP;
+ mode = IDBTransaction::Mode::Cleanup;
mQuotaExceeded = false;
} else {
- mode = IDBTransaction::READ_WRITE;
+ mode = IDBTransaction::Mode::ReadWrite;
}
break;
case IDBTransactionMode::Readwriteflush:
- mode = IDBTransaction::READ_WRITE_FLUSH;
+ mode = IDBTransaction::Mode::ReadWriteFlush;
break;
case IDBTransactionMode::Cleanup:
- mode = IDBTransaction::CLEANUP;
+ mode = IDBTransaction::Mode::Cleanup;
mQuotaExceeded = false;
break;
case IDBTransactionMode::Versionchange:
@@ -713,7 +713,7 @@
transaction->SetBackgroundActor(actor);
- if (mode == IDBTransaction::CLEANUP) {
+ if (mode == IDBTransaction::Mode::Cleanup) {
ExpireFileActors(/* aExpireAll */ true);
}
@@ -857,14 +857,14 @@
if (aShouldWarn) {
switch (transaction->GetMode()) {
// We ignore transactions that could not have written any data.
- case IDBTransaction::READ_ONLY:
+ case IDBTransaction::Mode::ReadOnly:
break;
// We warn for any transactions that could have written data.
- case IDBTransaction::READ_WRITE:
- case IDBTransaction::READ_WRITE_FLUSH:
- case IDBTransaction::CLEANUP:
- case IDBTransaction::VERSION_CHANGE:
+ case IDBTransaction::Mode::ReadWrite:
+ case IDBTransaction::Mode::ReadWriteFlush:
+ case IDBTransaction::Mode::Cleanup:
+ case IDBTransaction::Mode::VersionChange:
transactionsThatNeedWarning.AppendElement(transaction);
break;
--- mozilla/dom/indexedDB/SerializationHelpers.h.orig 2022-08-29 19:03:06.732099103 -0700
+++ mozilla/dom/indexedDB/SerializationHelpers.h 2022-08-29 19:03:45.096655140 -0700
@@ -87,8 +87,8 @@
struct ParamTraits<mozilla::dom::IDBTransaction::Mode> :
public ContiguousEnumSerializer<
mozilla::dom::IDBTransaction::Mode,
- mozilla::dom::IDBTransaction::READ_ONLY,
- mozilla::dom::IDBTransaction::MODE_INVALID>
+ mozilla::dom::IDBTransaction::Mode::ReadOnly,
+ mozilla::dom::IDBTransaction::Mode::Invalid>
{ };
} // namespace IPC
--- mozilla/dom/indexedDB/IDBTransaction.h.orig 2022-08-29 18:56:02.081944419 -0700
+++ mozilla/dom/indexedDB/IDBTransaction.h 2022-08-29 19:01:45.938928124 -0700
@@ -54,25 +54,19 @@
friend class WorkerHolder;
public:
- enum Mode
+ enum struct Mode
{
- READ_ONLY = 0,
- READ_WRITE,
- READ_WRITE_FLUSH,
- CLEANUP,
- VERSION_CHANGE,
+ ReadOnly = 0,
+ ReadWrite,
+ ReadWriteFlush,
+ Cleanup,
+ VersionChange,
// Only needed for IPC serialization helper, should never be used in code.
- MODE_INVALID
+ Invalid
};
- enum ReadyState
- {
- INITIAL = 0,
- LOADING,
- COMMITTING,
- DONE
- };
+ enum struct ReadyState { Initial = 0, Loading, Inactive, Committing, Done };
private:
RefPtr<IDBDatabase> mDatabase;
@@ -82,8 +76,8 @@
nsTArray<RefPtr<IDBObjectStore>> mDeletedObjectStores;
nsAutoPtr<WorkerHolder> mWorkerHolder;
- // Tagged with mMode. If mMode is VERSION_CHANGE then mBackgroundActor will be
- // a BackgroundVersionChangeTransactionChild. Otherwise it will be a
+ // Tagged with mMode. If mMode is Mode::VersionChange then mBackgroundActor
+ // will be a BackgroundVersionChangeTransactionChild. Otherwise it will be a
// BackgroundTransactionChild.
union {
indexedDB::BackgroundTransactionChild* mNormalBackgroundActor;
@@ -92,7 +86,7 @@
const int64_t mLoggingSerialNumber;
- // Only used for VERSION_CHANGE transactions.
+ // Only used for Mode::VersionChange transactions.
int64_t mNextObjectStoreId;
int64_t mNextIndexId;
@@ -147,7 +141,7 @@
{
AssertIsOnOwningThread();
- if (mMode == VERSION_CHANGE) {
+ if (mMode == Mode::VersionChange) {
mBackgroundActor.mVersionChangeBackgroundActor = nullptr;
} else {
mBackgroundActor.mNormalBackgroundActor = nullptr;
@@ -172,7 +166,7 @@
{
AssertIsOnOwningThread();
- return mReadyState == COMMITTING || mReadyState == DONE;
+ return mReadyState == ReadyState::Committing || mReadyState == ReadyState::Done;
}
bool
@@ -180,17 +174,17 @@
{
AssertIsOnOwningThread();
- return mReadyState == DONE;
+ return mReadyState == ReadyState::Done;
}
bool
IsWriteAllowed() const
{
AssertIsOnOwningThread();
- return mMode == READ_WRITE ||
- mMode == READ_WRITE_FLUSH ||
- mMode == CLEANUP ||
- mMode == VERSION_CHANGE;
+ return mMode == Mode::ReadWrite ||
+ mMode == Mode::ReadWriteFlush ||
+ mMode == Mode::Cleanup ||
+ mMode == Mode::VersionChange;
}
bool
@@ -296,11 +290,11 @@
void
FireCompleteOrAbortEvents(nsresult aResult);
- // Only for VERSION_CHANGE transactions.
+ // Only for Mode::VersionChange transactions.
int64_t
NextObjectStoreId();
- // Only for VERSION_CHANGE transactions.
+ // Only for Mode::VersionChange transactions.
int64_t
NextIndexId();
--- mozilla/dom/indexedDB/ActorsParent.cpp.orig 2022-08-29 18:27:44.972687084 -0700
+++ mozilla/dom/indexedDB/ActorsParent.cpp 2022-08-29 18:39:08.258879470 -0700
@@ -9112,7 +9112,7 @@
MOZ_ASSERT(mLoggingInfo.nextVersionChangeTransactionSerialNumber() >
INT64_MIN);
- if (aMode == IDBTransaction::VERSION_CHANGE) {
+ if (aMode == IDBTransaction::Mode::VersionChange) {
return mLoggingInfo.nextVersionChangeTransactionSerialNumber()--;
}
@@ -11526,11 +11526,10 @@
if (mConnection) {
mConnection->AssertIsOnConnectionThread();
MOZ_ASSERT(mDEBUGTransaction);
- MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE ||
- mDEBUGTransaction->GetMode() ==
- IDBTransaction::READ_WRITE_FLUSH ||
- mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP ||
- mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::Mode::ReadWrite ||
+ mDEBUGTransaction->GetMode() == IDBTransaction::Mode::ReadWriteFlush ||
+ mDEBUGTransaction->GetMode() == IDBTransaction::Mode::Cleanup ||
+ mDEBUGTransaction->GetMode() == IDBTransaction::Mode::VersionChange);
if (NS_FAILED(mConnection->RollbackSavepoint())) {
NS_WARNING("Failed to rollback savepoint!");
@@ -11543,10 +11542,10 @@
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::VERSION_CHANGE);
+ MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::Mode::ReadWrite ||
+ aTransaction->GetMode() == IDBTransaction::Mode::ReadWriteFlush ||
+ aTransaction->GetMode() == IDBTransaction::Mode::Cleanup ||
+ aTransaction->GetMode() == IDBTransaction::Mode::VersionChange);
DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
MOZ_ASSERT(connection);
@@ -14689,19 +14688,19 @@
return nullptr;
}
- if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY &&
- aMode != IDBTransaction::READ_WRITE &&
- aMode != IDBTransaction::READ_WRITE_FLUSH &&
- aMode != IDBTransaction::CLEANUP)) {
+ if (NS_WARN_IF(aMode != IDBTransaction::Mode::ReadOnly &&
+ aMode != IDBTransaction::Mode::ReadWrite &&
+ aMode != IDBTransaction::Mode::ReadWriteFlush &&
+ aMode != IDBTransaction::Mode::Cleanup)) {
ASSERT_UNLESS_FUZZING();
return nullptr;
}
// If this is a readwrite transaction to a chrome database make sure the child
// has write access.
- if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE ||
- aMode == IDBTransaction::READ_WRITE_FLUSH ||
- aMode == IDBTransaction::CLEANUP) &&
+ if (NS_WARN_IF((aMode == IDBTransaction::Mode::ReadWrite ||
+ aMode == IDBTransaction::Mode::ReadWriteFlush ||
+ aMode == IDBTransaction::Mode::Cleanup) &&
mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo &&
!mChromeWriteAccessAllowed)) {
return nullptr;
@@ -14764,10 +14763,10 @@
AssertIsOnBackgroundThread();
MOZ_ASSERT(aActor);
MOZ_ASSERT(!aObjectStoreNames.IsEmpty());
- MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY ||
- aMode == IDBTransaction::READ_WRITE ||
- aMode == IDBTransaction::READ_WRITE_FLUSH ||
- aMode == IDBTransaction::CLEANUP);
+ MOZ_ASSERT(aMode == IDBTransaction::Mode::ReadOnly ||
+ aMode == IDBTransaction::Mode::ReadWrite ||
+ aMode == IDBTransaction::Mode::ReadWriteFlush ||
+ aMode == IDBTransaction::Mode::Cleanup);
MOZ_ASSERT(!mClosed);
if (IsInvalidated()) {
@@ -14789,7 +14788,7 @@
mMetadata->mDatabaseId,
transaction->LoggingSerialNumber(),
aObjectStoreNames,
- aMode != IDBTransaction::READ_ONLY);
+ aMode != IDBTransaction::Mode::ReadOnly);
transaction->SetActive(transactionId);
@@ -14926,14 +14925,14 @@
Transaction()->SetActiveOnConnectionThread();
- if (Transaction()->GetMode() == IDBTransaction::CLEANUP) {
+ if (Transaction()->GetMode() == IDBTransaction::Mode::Cleanup) {
nsresult rv = aConnection->DisableQuotaChecks();
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
}
- if (Transaction()->GetMode() != IDBTransaction::READ_ONLY) {
+ if (Transaction()->GetMode() != IDBTransaction::Mode::ReadOnly) {
nsresult rv = aConnection->BeginWriteTransaction();
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
@@ -15243,10 +15242,10 @@
}
case RequestParams::TObjectStoreDeleteParams: {
- if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
- mMode != IDBTransaction::READ_WRITE_FLUSH &&
- mMode != IDBTransaction::CLEANUP &&
- mMode != IDBTransaction::VERSION_CHANGE)) {
+ if (NS_WARN_IF(mMode != IDBTransaction::Mode::ReadWrite &&
+ mMode != IDBTransaction::Mode::ReadWriteFlush &&
+ mMode != IDBTransaction::Mode::Cleanup &&
+ mMode != IDBTransaction::Mode::VersionChange)) {
ASSERT_UNLESS_FUZZING();
return false;
}
@@ -15267,10 +15266,10 @@
}
case RequestParams::TObjectStoreClearParams: {
- if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
- mMode != IDBTransaction::READ_WRITE_FLUSH &&
- mMode != IDBTransaction::CLEANUP &&
- mMode != IDBTransaction::VERSION_CHANGE)) {
+ if (NS_WARN_IF(mMode != IDBTransaction::Mode::ReadWrite &&
+ mMode != IDBTransaction::Mode::ReadWriteFlush &&
+ mMode != IDBTransaction::Mode::Cleanup &&
+ mMode != IDBTransaction::Mode::VersionChange)) {
ASSERT_UNLESS_FUZZING();
return false;
}
@@ -15454,9 +15453,9 @@
{
AssertIsOnBackgroundThread();
- if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
- mMode != IDBTransaction::READ_WRITE_FLUSH &&
- mMode != IDBTransaction::VERSION_CHANGE)) {
+ if (NS_WARN_IF(mMode != IDBTransaction::Mode::ReadWrite &&
+ mMode != IDBTransaction::Mode::ReadWriteFlush &&
+ mMode != IDBTransaction::Mode::VersionChange)) {
ASSERT_UNLESS_FUZZING();
return false;
}
@@ -16075,7 +16074,7 @@
VersionChangeTransaction::VersionChangeTransaction(
OpenDatabaseOp* aOpenDatabaseOp)
: TransactionBase(aOpenDatabaseOp->mDatabase,
- IDBTransaction::VERSION_CHANGE)
+ IDBTransaction::Mode::VersionChange)
, mOpenDatabaseOp(aOpenDatabaseOp)
, mActorWasAlive(false)
{
@@ -22457,7 +22456,7 @@
MOZ_ASSERT(mState == State::WaitingForTransactionsToComplete);
MOZ_ASSERT(mVersionChangeTransaction);
MOZ_ASSERT(mVersionChangeTransaction->GetMode() ==
- IDBTransaction::VERSION_CHANGE);
+ IDBTransaction::Mode::VersionChange);
MOZ_ASSERT(mMaybeBlockedDatabases.IsEmpty());
if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) ||
@@ -23957,10 +23956,10 @@
{
MOZ_ASSERT(mTransaction);
mTransaction->AssertIsOnConnectionThread();
- MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
- mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
- mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::Mode::ReadWrite ||
+ mTransaction->GetMode() == IDBTransaction::Mode::ReadWriteFlush ||
+ mTransaction->GetMode() == IDBTransaction::Mode::Cleanup ||
+ mTransaction->GetMode() == IDBTransaction::Mode::VersionChange);
const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
mTransaction->mModifiedAutoIncrementObjectStoreMetadataArray;
@@ -24025,10 +24024,10 @@
{
MOZ_ASSERT(mTransaction);
mTransaction->AssertIsOnConnectionThread();
- MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
- mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
- mTransaction->GetMode() == IDBTransaction::CLEANUP ||
- mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::Mode::ReadWrite ||
+ mTransaction->GetMode() == IDBTransaction::Mode::ReadWriteFlush ||
+ mTransaction->GetMode() == IDBTransaction::Mode::Cleanup ||
+ mTransaction->GetMode() == IDBTransaction::Mode::VersionChange);
nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
mTransaction->mModifiedAutoIncrementObjectStoreMetadataArray;
@@ -24059,7 +24058,7 @@
MOZ_ASSERT(aConnection);
MOZ_ASSERT(mTransaction);
mTransaction->AssertIsOnConnectionThread();
- MOZ_ASSERT(mTransaction->GetMode() != IDBTransaction::READ_ONLY);
+ MOZ_ASSERT(mTransaction->GetMode() != IDBTransaction::Mode::ReadOnly);
DatabaseConnection::CachedStatement pragmaStmt;
MOZ_ALWAYS_SUCCEEDS(
@@ -24109,7 +24108,7 @@
mTransaction->LoggingSerialNumber(),
mLoggingSerialNumber);
- if (mTransaction->GetMode() != IDBTransaction::READ_ONLY &&
+ if (mTransaction->GetMode() != IDBTransaction::Mode::ReadOnly &&
mTransaction->mHasBeenActiveOnConnectionThread) {
Database* database = mTransaction->GetDatabase();
MOZ_ASSERT(database);
@@ -24138,7 +24137,7 @@
NS_WARNING_ASSERTION(NS_SUCCEEDED(mResultCode), "Commit failed!");
if (NS_SUCCEEDED(mResultCode) &&
- mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH) {
+ mTransaction->GetMode() == IDBTransaction::Mode::ReadWriteFlush) {
mResultCode = connection->Checkpoint();
}
@@ -24161,7 +24161,7 @@
connection->FinishWriteTransaction();
- if (mTransaction->GetMode() == IDBTransaction::CLEANUP) {
+ if (mTransaction->GetMode() == IDBTransaction::Mode::Cleanup) {
connection->DoIdleProcessing(/* aNeedsCheckpoint */ true);
connection->EnableQuotaChecks();
@@ -26030,7 +26030,7 @@
MOZ_ASSERT(aHasIndexes);
bool hasIndexes;
- if (aOp->Transaction()->GetMode() == IDBTransaction::VERSION_CHANGE &&
+ if (aOp->Transaction()->GetMode() == IDBTransaction::Mode::VersionChange &&
aMayHaveIndexes) {
// If this is a version change transaction then mObjectStoreMayHaveIndexes
// could be wrong (e.g. if a unique index failed to be created due to a
--- mozilla/dom/indexedDB/IDBObjectStore.cpp.orig 2022-08-29 18:46:09.517163341 -0700
+++ mozilla/dom/indexedDB/IDBObjectStore.cpp 2022-08-29 18:47:31.658388603 -0700
@@ -1406,7 +1406,7 @@
MOZ_ASSERT(aCx);
MOZ_ASSERT_IF(aFromCursor, aOverwrite);
- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ if (mTransaction->GetMode() == IDBTransaction::Mode::Cleanup ||
mDeletedSpec) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
return nullptr;
@@ -1991,7 +1991,7 @@
{
AssertIsOnOwningThread();
- if (mTransaction->GetMode() != IDBTransaction::VERSION_CHANGE ||
+ if (mTransaction->GetMode() != IDBTransaction::Mode::VersionChange ||
mDeletedSpec) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
return nullptr;
@@ -2103,7 +2103,7 @@
{
AssertIsOnOwningThread();
- if (mTransaction->GetMode() != IDBTransaction::VERSION_CHANGE ||
+ if (mTransaction->GetMode() != IDBTransaction::Mode::VersionChange ||
mDeletedSpec) {
aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
return;
@@ -2426,7 +2426,7 @@
{
AssertIsOnOwningThread();
- if (mTransaction->GetMode() != IDBTransaction::VERSION_CHANGE ||
+ if (mTransaction->GetMode() != IDBTransaction::Mode::VersionChange ||
mDeletedSpec) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return;
--- mozilla/dom/indexedDB/ActorsChild.h.orig 2022-08-29 18:26:39.135704995 -0700
+++ mozilla/dom/indexedDB/ActorsChild.h 2022-08-29 18:27:21.320334262 -0700
@@ -111,7 +111,7 @@
MOZ_ASSERT(mLoggingInfo.nextVersionChangeTransactionSerialNumber() >
INT64_MIN);
- if (aMode == IDBTransaction::VERSION_CHANGE) {
+ if (aMode == IDBTransaction::Mode::VersionChange) {
return mLoggingInfo.nextVersionChangeTransactionSerialNumber()--;
}
--- mozilla/dom/indexedDB/IDBTransaction.cpp.orig 2022-08-29 18:48:01.886839518 -0700
+++ mozilla/dom/indexedDB/IDBTransaction.cpp 2022-08-29 19:14:26.109484393 -0700
@@ -82,7 +82,7 @@
, mPendingRequestCount(0)
, mLineNo(0)
, mColumn(0)
- , mReadyState(IDBTransaction::INITIAL)
+ , mReadyState(IDBTransaction::ReadyState::Initial)
, mMode(aMode)
, mCreating(false)
, mRegistered(false)
@@ -134,10 +134,10 @@
MOZ_ASSERT(!mPendingRequestCount);
MOZ_ASSERT(!mCreating);
MOZ_ASSERT(mSentCommitOrAbort);
- MOZ_ASSERT_IF(mMode == VERSION_CHANGE &&
+ MOZ_ASSERT_IF(mMode == Mode::VersionChange &&
mBackgroundActor.mVersionChangeBackgroundActor,
mFiredCompleteOrAbort);
- MOZ_ASSERT_IF(mMode != VERSION_CHANGE &&
+ MOZ_ASSERT_IF(mMode != Mode::VersionChange &&
mBackgroundActor.mNormalBackgroundActor,
mFiredCompleteOrAbort);
@@ -148,7 +148,7 @@
#endif
}
- if (mMode == VERSION_CHANGE) {
+ if (mMode == Mode::VersionChange) {
if (auto* actor = mBackgroundActor.mVersionChangeBackgroundActor) {
actor->SendDeleteMeInternal(/* aFailedConstructor */ false);
@@ -184,7 +184,7 @@
RefPtr<IDBTransaction> transaction =
new IDBTransaction(aDatabase,
emptyObjectStoreNames,
- VERSION_CHANGE);
+ Mode::VersionChange);
aOpenRequest->GetCallerLocation(transaction->mFilename,
&transaction->mLineNo, &transaction->mColumn);
@@ -213,10 +213,10 @@
MOZ_ASSERT(aDatabase);
aDatabase->AssertIsOnOwningThread();
MOZ_ASSERT(!aObjectStoreNames.IsEmpty());
- MOZ_ASSERT(aMode == READ_ONLY ||
- aMode == READ_WRITE ||
- aMode == READ_WRITE_FLUSH ||
- aMode == CLEANUP);
+ MOZ_ASSERT(aMode == Mode::ReadOnly ||
+ aMode == Mode::ReadWrite ||
+ aMode == Mode::ReadWriteFlush ||
+ aMode == Mode::Cleanup);
RefPtr<IDBTransaction> transaction =
new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
@@ -281,7 +281,7 @@
AssertIsOnOwningThread();
MOZ_ASSERT(aBackgroundActor);
MOZ_ASSERT(!mBackgroundActor.mNormalBackgroundActor);
- MOZ_ASSERT(mMode != VERSION_CHANGE);
+ MOZ_ASSERT(mMode != Mode::VersionChange);
mBackgroundActor.mNormalBackgroundActor = aBackgroundActor;
}
@@ -295,7 +295,7 @@
BackgroundRequestChild* actor = new BackgroundRequestChild(aRequest);
- if (mMode == VERSION_CHANGE) {
+ if (mMode == Mode::VersionChange) {
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
mBackgroundActor.mVersionChangeBackgroundActor->
@@ -321,7 +321,7 @@
MOZ_ASSERT(aBackgroundActor);
MOZ_ASSERT(aParams.type() != OpenCursorParams::T__None);
- if (mMode == VERSION_CHANGE) {
+ if (mMode == Mode::VersionChange) {
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
mBackgroundActor.mVersionChangeBackgroundActor->
@@ -361,8 +361,8 @@
AssertIsOnOwningThread();
if (!mPendingRequestCount) {
- MOZ_ASSERT(INITIAL == mReadyState);
- mReadyState = LOADING;
+ MOZ_ASSERT(mReadyState == ReadyState::Initial);
+ mReadyState = ReadyState::Loading;
}
++mPendingRequestCount;
@@ -377,7 +377,7 @@
--mPendingRequestCount;
if (!mPendingRequestCount) {
- mReadyState = COMMITTING;
+ mReadyState = ReadyState::Committing;
if (aActorDestroyedNormally) {
if (NS_SUCCEEDED(mAbortCode)) {
@@ -421,7 +421,7 @@
LoggingSerialNumber(),
requestSerialNumber);
- if (mMode == VERSION_CHANGE) {
+ if (mMode == Mode::VersionChange) {
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
mBackgroundActor.mVersionChangeBackgroundActor->SendCommit();
} else {
@@ -454,7 +454,7 @@
requestSerialNumber,
aResultCode);
- if (mMode == VERSION_CHANGE) {
+ if (mMode == Mode::VersionChange) {
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
mBackgroundActor.mVersionChangeBackgroundActor->SendAbort(aResultCode);
} else {
@@ -473,7 +473,7 @@
AssertIsOnOwningThread();
// If we haven't started anything then we're open.
- if (mReadyState == IDBTransaction::INITIAL) {
+ if (mReadyState == IDBTransaction::ReadyState::Initial) {
return true;
}
@@ -482,7 +482,7 @@
// from the time we were created) then we are open. Otherwise check the
// currently running transaction to see if it's the same. We only allow other
// requests to be made if this transaction is currently running.
- if (mReadyState == IDBTransaction::LOADING &&
+ if (mReadyState == IDBTransaction::ReadyState::Loading &&
(mCreating || GetCurrent() == this)) {
return true;
}
@@ -508,7 +508,7 @@
{
AssertIsOnOwningThread();
MOZ_ASSERT(aSpec.metadata().id());
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
MOZ_ASSERT(IsOpen());
@@ -540,7 +540,7 @@
{
AssertIsOnOwningThread();
MOZ_ASSERT(aObjectStoreId);
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
MOZ_ASSERT(IsOpen());
@@ -571,7 +571,7 @@
{
AssertIsOnOwningThread();
MOZ_ASSERT(aObjectStoreId);
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
MOZ_ASSERT(IsOpen());
@@ -586,7 +586,7 @@
AssertIsOnOwningThread();
MOZ_ASSERT(aObjectStore);
MOZ_ASSERT(aMetadata.id());
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
MOZ_ASSERT(IsOpen());
@@ -601,7 +601,7 @@
AssertIsOnOwningThread();
MOZ_ASSERT(aObjectStore);
MOZ_ASSERT(aIndexId);
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
MOZ_ASSERT(IsOpen());
@@ -617,7 +617,7 @@
AssertIsOnOwningThread();
MOZ_ASSERT(aObjectStore);
MOZ_ASSERT(aIndexId);
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
MOZ_ASSERT(mBackgroundActor.mVersionChangeBackgroundActor);
MOZ_ASSERT(IsOpen());
@@ -637,12 +637,12 @@
RefPtr<DOMError> error = aError;
- const bool isVersionChange = mMode == VERSION_CHANGE;
+ const bool isVersionChange = mMode == Mode::VersionChange;
const bool isInvalidated = mDatabase->IsInvalidated();
- bool needToSendAbort = mReadyState == INITIAL;
+ bool needToSendAbort = mReadyState == ReadyState::Initial;
mAbortCode = aAbortCode;
- mReadyState = DONE;
+ mReadyState = ReadyState::Done;
mError = error.forget();
if (isVersionChange) {
@@ -775,7 +775,7 @@
AssertIsOnOwningThread();
MOZ_ASSERT(!mFiredCompleteOrAbort);
- mReadyState = DONE;
+ mReadyState = ReadyState::Done;
#ifdef DEBUG
mFiredCompleteOrAbort = true;
@@ -834,7 +834,7 @@
IDBTransaction::NextObjectStoreId()
{
AssertIsOnOwningThread();
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
return mNextObjectStoreId++;
}
@@ -843,7 +843,7 @@
IDBTransaction::NextIndexId()
{
AssertIsOnOwningThread();
- MOZ_ASSERT(VERSION_CHANGE == mMode);
+ MOZ_ASSERT(mMode == Mode::VersionChange);
return mNextIndexId++;
}
@@ -862,22 +862,22 @@
AssertIsOnOwningThread();
switch (mMode) {
- case READ_ONLY:
+ case Mode::ReadOnly:
return IDBTransactionMode::Readonly;
- case READ_WRITE:
+ case Mode::ReadWrite:
return IDBTransactionMode::Readwrite;
- case READ_WRITE_FLUSH:
+ case Mode::ReadWriteFlush:
return IDBTransactionMode::Readwriteflush;
- case CLEANUP:
+ case Mode::Cleanup:
return IDBTransactionMode::Cleanup;
- case VERSION_CHANGE:
+ case Mode::VersionChange:
return IDBTransactionMode::Versionchange;
- case MODE_INVALID:
+ case Mode::Invalid:
default:
MOZ_CRASH("Bad mode!");
}
@@ -896,7 +896,7 @@
{
AssertIsOnOwningThread();
- if (mMode == IDBTransaction::VERSION_CHANGE) {
+ if (mMode == IDBTransaction::Mode::VersionChange) {
return mDatabase->ObjectStoreNames();
}
@@ -917,7 +917,7 @@
const ObjectStoreSpec* spec = nullptr;
- if (IDBTransaction::VERSION_CHANGE == mMode ||
+ if (IDBTransaction::Mode::VersionChange == mMode ||
mObjectStoreNames.Contains(aName)) {
const nsTArray<ObjectStoreSpec>& objectStores =
mDatabase->Spec()->objectStores();
@@ -1014,8 +1014,8 @@
mCreating = false;
// Maybe commit if there were no requests generated.
- if (mReadyState == IDBTransaction::INITIAL) {
- mReadyState = DONE;
+ if (mReadyState == IDBTransaction::ReadyState::Initial) {
+ mReadyState = ReadyState::Done;
SendCommit();
}
--- mozilla/dom/indexedDB/IDBCursor.cpp.orig 2022-08-29 19:33:54.855932372 -0700
+++ mozilla/dom/indexedDB/IDBCursor.cpp 2022-08-29 19:34:29.932365984 -0700
@@ -696,7 +696,7 @@
return nullptr;
}
- if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
+ if (mTransaction->GetMode() == IDBTransaction::Mode::Cleanup ||
IsSourceDeleted() ||
!mHaveValue ||
mType == Type_ObjectStoreKey ||
--- mozilla/dom/indexedDB/IDBIndex.cpp.orig 2022-08-29 19:59:04.061664597 -0700
+++ mozilla/dom/indexedDB/IDBIndex.cpp 2022-08-29 19:59:28.978036578 -0700
@@ -156,7 +156,7 @@
IDBTransaction* transaction = mObjectStore->Transaction();
- if (transaction->GetMode() != IDBTransaction::VERSION_CHANGE ||
+ if (transaction->GetMode() != IDBTransaction::Mode::VersionChange ||
mDeletedMetadata) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return;
