Backed out 8 changesets (bug 1497007) for causing build bustages in /builds/worker/workspace/build/src/dom/indexedDB/IDBTransaction.cpp CLOSED TREE

Backed out changeset 15de0d72f1c4 (bug 1497007)
Backed out changeset 7056932f6422 (bug 1497007)
Backed out changeset 7304fae8c436 (bug 1497007)
Backed out changeset be22a95de04b (bug 1497007)
Backed out changeset 98ac48b5f1ef (bug 1497007)
Backed out changeset 562d3cda9fa3 (bug 1497007)
Backed out changeset 3f96e71be2e3 (bug 1497007)
Backed out changeset 3d9e86698c9f (bug 1497007)

Author: shindli

dom/indexedDB/IDBDatabase.cpp

@@ -732,8 +732,6 @@ void IDBDatabase::AbortTransactions(bool aShouldWarn) {
           aDatabase->mTransactions;
 
       if (!transactionTable.Count()) {
-        // Return early as an optimization, the remainder is a no-op in this
-        // case.
         return;
       }
 
@@ -756,8 +754,6 @@ void IDBDatabase::AbortTransactions(bool aShouldWarn) {
       MOZ_ASSERT(transactionsToAbort.Length() <= transactionTable.Count());
 
       if (transactionsToAbort.IsEmpty()) {
-        // Return early as an optimization, the remainder is a no-op in this
-        // case.
         return;
       }
 
@@ -772,10 +768,23 @@ void IDBDatabase::AbortTransactions(bool aShouldWarn) {
         MOZ_ASSERT(transaction);
         MOZ_ASSERT(!transaction->IsDone());
 
-        // We warn for any transactions that could have written data, but
-        // ignore read-only transactions.
-        if (aShouldWarn && transaction->IsWriteAllowed()) {
-          transactionsThatNeedWarning.AppendElement(transaction);
+        if (aShouldWarn) {
+          switch (transaction->GetMode()) {
+            // We ignore transactions that could not have written any data.
+            case IDBTransaction::READ_ONLY:
+              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:
+              transactionsThatNeedWarning.AppendElement(transaction);
+              break;
+
+            default:
+              MOZ_CRASH("Unknown mode!");
+          }
         }
 
         transaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);

dom/indexedDB/IDBIndex.cpp

@@ -88,16 +88,24 @@ void IDBIndex::RefreshMetadata(bool aMayDelete) {
   AssertIsOnOwningThread();
   MOZ_ASSERT_IF(mDeletedMetadata, mMetadata == mDeletedMetadata);
 
-  const auto& indexes = mObjectStore->Spec().indexes();
-  const auto foundIt = std::find_if(
-      indexes.cbegin(), indexes.cend(),
-      [id = Id()](const auto& metadata) { return metadata.id() == id; });
-  const bool found = foundIt != indexes.cend();
+  const nsTArray<IndexMetadata>& indexes = mObjectStore->Spec().indexes();
+
+  bool found = false;
+
+  for (uint32_t count = indexes.Length(), index = 0; index < count; index++) {
+    const IndexMetadata& metadata = indexes[index];
+
+    if (metadata.id() == Id()) {
+      mMetadata = &metadata;
+
+      found = true;
+      break;
+    }
+  }
 
   MOZ_ASSERT_IF(!aMayDelete && !mDeletedMetadata, found);
 
   if (found) {
-    mMetadata = &*foundIt;
     MOZ_ASSERT(mMetadata != mDeletedMetadata);
     mDeletedMetadata = nullptr;
   } else {

dom/indexedDB/IDBObjectStore.cpp

@@ -2353,20 +2353,27 @@ void IDBObjectStore::RefreshSpec(bool aMayDelete) {
 
   const nsTArray<ObjectStoreSpec>& objectStores = dbSpec->objectStores();
 
-  const auto foundIt = std::find_if(objectStores.cbegin(), objectStores.cend(),
-                                    [id = Id()](const auto& objSpec) {
-                                      return objSpec.metadata().id() == id;
-                                    });
-  const bool found = foundIt != objectStores.cend();
-  if (found) {
-    mSpec = &*foundIt;
+  bool found = false;
 
-    for (auto& index : mIndexes) {
-      index->RefreshMetadata(aMayDelete);
-    }
+  for (uint32_t objCount = objectStores.Length(), objIndex = 0;
+       objIndex < objCount; objIndex++) {
+    const ObjectStoreSpec& objSpec = objectStores[objIndex];
+
+    if (objSpec.metadata().id() == Id()) {
+      mSpec = &objSpec;
+
+      for (uint32_t idxCount = mIndexes.Length(), idxIndex = 0;
+           idxIndex < idxCount; idxIndex++) {
+        mIndexes[idxIndex]->RefreshMetadata(aMayDelete);
+      }
+
+      for (uint32_t idxCount = mDeletedIndexes.Length(), idxIndex = 0;
+           idxIndex < idxCount; idxIndex++) {
+        mDeletedIndexes[idxIndex]->RefreshMetadata(false);
+      }
 
-    for (auto& index : mDeletedIndexes) {
-      index->RefreshMetadata(false);
+      found = true;
+      break;
     }
   }