firefox-nss.patch

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