Backout 26ac81280f33 (bug 692911) for Moth orange on all platforms & M2 orange on win opt

dom/indexedDB/AsyncConnectionHelper.cpp

@@ -560,8 +560,8 @@ TransactionPoolEventTarget::Dispatch(nsIRunnable* aRunnable,
   NS_ASSERTION(aRunnable, "Null pointer!");
   NS_ASSERTION(aFlags == NS_DISPATCH_NORMAL, "Unsupported!");
 
-  TransactionThreadPool* pool = TransactionThreadPool::Get();
-  NS_ASSERTION(pool, "This should never be null!");
+  TransactionThreadPool* pool = TransactionThreadPool::GetOrCreate();
+  NS_ENSURE_TRUE(pool, NS_ERROR_FAILURE);
 
   return pool->Dispatch(mTransaction, aRunnable, false, nsnull);
 }

dom/indexedDB/AsyncConnectionHelper.h

@@ -125,11 +125,6 @@ public:
 
   static IDBTransaction* GetCurrentTransaction();
 
-  bool HasTransaction()
-  {
-    return mTransaction;
-  }
-
   nsISupports* GetSource()
   {
     return mRequest ? mRequest->Source() : nsnull;

dom/indexedDB/DatabaseInfo.cpp

@@ -85,8 +85,7 @@ EnumerateObjectStoreNames(const nsAString& aKey,
 DatabaseInfo::DatabaseInfo()
 : id(0),
   nextObjectStoreId(1),
-  nextIndexId(1),
-  runningVersionChange(false)
+  nextIndexId(1)
 {
   MOZ_COUNT_CTOR(DatabaseInfo);
 }

dom/indexedDB/DatabaseInfo.h

@@ -54,8 +54,7 @@ struct DatabaseInfo
   ~DatabaseInfo();
 #else
   DatabaseInfo()
-  : id(0), nextObjectStoreId(1), nextIndexId(1), runningVersionChange(false)
-  { }
+  : id(0), nextObjectStoreId(1), nextIndexId(1) { }
 #endif
 
   static bool Get(PRUint32 aId,
@@ -74,7 +73,6 @@ struct DatabaseInfo
   nsString filePath;
   PRInt64 nextObjectStoreId;
   PRInt64 nextIndexId;
-  bool runningVersionChange;
 
   nsAutoRefCnt referenceCount;
 };

dom/indexedDB/IDBDatabase.cpp

@@ -428,34 +428,6 @@ IDBDatabase::IsClosed()
   return mClosed;
 }
 
-void
-IDBDatabase::EnterSetVersionTransaction()
-{
-  DatabaseInfo* dbInfo;
-  if (!DatabaseInfo::Get(mDatabaseId, &dbInfo)) {
-    NS_ERROR("This should never fail!");
-  }
-
-  NS_ASSERTION(!dbInfo->runningVersionChange, "How did that happen?");
-  dbInfo->runningVersionChange = true;
-}
-
-void
-IDBDatabase::ExitSetVersionTransaction()
-{
-  DatabaseInfo* dbInfo;
-  if (!DatabaseInfo::Get(mDatabaseId, &dbInfo)) {
-    NS_ERROR("This should never fail!");
-  }
-
-  NS_ASSERTION(dbInfo->runningVersionChange, "How did that happen?");
-  dbInfo->runningVersionChange = false;
-
-  IndexedDatabaseManager* manager = IndexedDatabaseManager::Get();
-  NS_ASSERTION(manager, "We should always have a manager here");
-  manager->UnblockSetVersionRunnable(this);
-}
-
 void
 IDBDatabase::OnUnlink()
 {
@@ -738,10 +710,6 @@ IDBDatabase::Transaction(nsIVariant* aStoreNames,
     NS_ERROR("This should never fail!");
   }
 
-  if (info->runningVersionChange) {
-    return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR;
-  }
-
   nsTArray<nsString> storesToOpen;
 
   switch (type) {

dom/indexedDB/IDBDatabase.h

@@ -135,9 +135,6 @@ public:
   // Whether or not the database has had Close called on it.
   bool IsClosed();
 
-  void EnterSetVersionTransaction();
-  void ExitSetVersionTransaction();
-
 private:
   IDBDatabase();
   ~IDBDatabase();

dom/indexedDB/IndexedDatabaseManager.cpp

@@ -693,15 +693,19 @@ IndexedDatabaseManager::OnDatabaseClosed(IDBDatabase* aDatabase)
 
       // Now run the helper if there are no more live databases.
       if (runnable->mHelper && runnable->mDatabases.IsEmpty()) {
-        // At this point, all databases are closed, so no new transactions can
-        // be started.  There may, however, still be outstanding transactions
-        // that have not completed.  We need to wait for those before we
-        // dispatch the helper.
+        // Don't hold the callback alive longer than necessary.
+        nsRefPtr<AsyncConnectionHelper> helper;
+        helper.swap(runnable->mHelper);
 
-        TransactionThreadPool* pool = TransactionThreadPool::GetOrCreate();
+        if (NS_FAILED(helper->DispatchToTransactionPool())) {
+          NS_WARNING("Failed to dispatch to thread pool!");
+        }
 
-        nsRefPtr<WaitForTransactionsToFinishRunnable> waitRunnable =
-          new WaitForTransactionsToFinishRunnable(runnable);
+        // Now wait for the transaction to complete. Completing the transaction
+        // will be our cue to remove the SetVersionRunnable from our list and
+        // therefore allow other SetVersion requests to begin.
+        TransactionThreadPool* pool = TransactionThreadPool::Get();
+        NS_ASSERTION(pool, "This should never be null!");
 
         // All other databases should be closed, so we only need to wait on this
         // one.
@@ -710,8 +714,8 @@ IndexedDatabaseManager::OnDatabaseClosed(IDBDatabase* aDatabase)
           NS_ERROR("This should never fail!");
         }
 
-        // Use the WaitForTransactionsToFinishRunnable as the callback.
-        if (!pool->WaitForAllDatabasesToComplete(array, waitRunnable)) {
+        // Use the SetVersionRunnable as the callback.
+        if (!pool->WaitForAllDatabasesToComplete(array, runnable)) {
           NS_WARNING("Failed to wait for transaction to complete!");
         }
       }
@@ -720,27 +724,6 @@ IndexedDatabaseManager::OnDatabaseClosed(IDBDatabase* aDatabase)
   }
 }
 
-void
-IndexedDatabaseManager::UnblockSetVersionRunnable(IDBDatabase* aDatabase)
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-  NS_ASSERTION(aDatabase, "Null pointer!");
-
-  // Check through the list of SetVersionRunnables to find the one we're seeking.
-  for (PRUint32 index = 0; index < mSetVersionRunnables.Length(); index++) {
-    nsRefPtr<SetVersionRunnable>& runnable = mSetVersionRunnables[index];
-
-    if (runnable->mRequestingDatabase->Id() == aDatabase->Id()) {
-      NS_ASSERTION(!runnable->mHelper,
-                 "Why are we unblocking a runnable if the helper didn't run?");
-      NS_DispatchToCurrentThread(runnable);
-      return;
-    }
-  }
-
-  NS_NOTREACHED("How did we get here!");
-}
-
 // static
 bool
 IndexedDatabaseManager::SetCurrentDatabase(IDBDatabase* aDatabase)
@@ -1300,39 +1283,3 @@ IndexedDatabaseManager::SetVersionRunnable::Run()
 
   return NS_OK;
 }
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(IndexedDatabaseManager::WaitForTransactionsToFinishRunnable,
-                              nsIRunnable)
-
-NS_IMETHODIMP
-IndexedDatabaseManager::WaitForTransactionsToFinishRunnable::Run()
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-
-  // Don't hold the callback alive longer than necessary.
-  nsRefPtr<AsyncConnectionHelper> helper;
-  helper.swap(mRunnable->mHelper);
-
-  nsRefPtr<SetVersionRunnable> runnable;
-  runnable.swap(mRunnable);
-
-  // If the helper has a transaction, dispatch it to the transaction
-  // threadpool.
-  if (helper->HasTransaction()) {
-    if (NS_FAILED(helper->DispatchToTransactionPool())) {
-      NS_WARNING("Failed to dispatch to thread pool!");
-    }
-  }
-  // Otherwise, dispatch it to the IO thread.
-  else {
-    IndexedDatabaseManager* manager = IndexedDatabaseManager::Get();
-    NS_ASSERTION(manager, "We should definitely have a manager here");
-
-    helper->Dispatch(manager->IOThread());
-  }
-
-  // The helper is responsible for calling
-  // IndexedDatabaseManager::UnblockSetVersionRunnable.
-
-  return NS_OK;
-}

dom/indexedDB/IndexedDatabaseManager.h

@@ -204,8 +204,6 @@ private:
   // Called when AsyncUsageRunnable has finished its Run() method.
   inline void OnUsageCheckComplete(AsyncUsageRunnable* aRunnable);
 
-  void UnblockSetVersionRunnable(IDBDatabase* aDatabase);
-
   // Responsible for waiting until all databases have been closed before running
   // the version change transaction. Created when
   // IndexedDatabaseManager::SetDatabaseVersion is called. Runs only once on the
@@ -229,26 +227,6 @@ private:
   // Called when SetVersionRunnable has finished its Run() method.
   inline void OnSetVersionRunnableComplete(SetVersionRunnable* aRunnable);
 
-
-  // A callback runnable used by the TransactionPool when it's safe to proceed
-  // with a SetVersion/DeleteDatabase/etc.
-  class WaitForTransactionsToFinishRunnable : public nsIRunnable
-  {
-  public:
-    WaitForTransactionsToFinishRunnable(SetVersionRunnable* aRunnable)
-    : mRunnable(aRunnable)
-    {
-      NS_ASSERTION(mRunnable, "Why don't we have a runnable?");
-      NS_ASSERTION(mRunnable->mDatabases.IsEmpty(), "We're here too early!");
-    }
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIRUNNABLE
-
-  private:
-    nsRefPtr<SetVersionRunnable> mRunnable;
-  };
-
   // Maintains a list of live databases per origin.
   nsClassHashtable<nsCStringHashKey, nsTArray<IDBDatabase*> > mLiveDatabases;
 

dom/indexedDB/OpenDatabaseHelper.cpp

@@ -495,13 +495,10 @@ public:
 
   NS_DECL_ISUPPORTS_INHERITED
 
+  nsresult DoDatabaseWork(mozIStorageConnection* aConnection);
   nsresult GetSuccessResult(JSContext* aCx,
                             jsval* aVal);
 
-protected:
-  nsresult DoDatabaseWork(mozIStorageConnection* aConnection);
-  nsresult Init();
-
   // SetVersionHelper never fires an error event at the request.  It hands that
   // responsibility back to the OpenDatabaseHelper
   void OnError() { }
@@ -687,7 +684,6 @@ OpenDatabaseHelper::StartSetVersion()
   // The SetVersionHelper is responsible for dispatching us back to the
   // main thread again and changing the state to eSetVersionCompleted.
   mState = eSetVersionPending;
-
   return NS_OK;
 }
 
@@ -715,12 +711,6 @@ OpenDatabaseHelper::Run()
                  mState == eSetVersionCompleted, "Why are we here?");
 
     if (mState == eSetVersionCompleted) {
-      // Allow transaction creation/other version change transactions to proceed
-      // before we fire events.  Other version changes will be postd to the end
-      // of the event loop, and will be behind whatever the page does in
-      // its error/success event handlers.
-      mDatabase->ExitSetVersionTransaction();
-
       mState = eFiringEvents;
     } else {
       // Notify the request that we're done, but only if we didn't just finish
@@ -875,15 +865,6 @@ OpenDatabaseHelper::NotifySetVersionFinished()
   return NS_DispatchToCurrentThread(this);
 }
 
-void
-OpenDatabaseHelper::BlockDatabase()
-{
-  NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-  NS_ASSERTION(mDatabase, "This is going bad fast.");
-
-  mDatabase->EnterSetVersionTransaction();
-}
-
 void
 OpenDatabaseHelper::DispatchSuccessEvent()
 {
@@ -935,15 +916,6 @@ OpenDatabaseHelper::ReleaseMainThreadObjects()
 
 NS_IMPL_ISUPPORTS_INHERITED0(SetVersionHelper, AsyncConnectionHelper);
 
-nsresult
-SetVersionHelper::Init()
-{
-  // Block transaction creation until we are done.
-  mOpenHelper->BlockDatabase();
-
-  return NS_OK;
-}
-
 nsresult
 SetVersionHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {

dom/indexedDB/OpenDatabaseHelper.h

@@ -82,7 +82,6 @@ public:
   }
 
   nsresult NotifySetVersionFinished();
-  void BlockDatabase();
 
 protected:
   // Methods only called on the main thread

dom/indexedDB/TransactionThreadPool.cpp

@@ -238,6 +238,7 @@ TransactionThreadPool::FinishTransaction(IDBTransaction* aTransaction)
 
 #ifdef DEBUG
   if (aTransaction->mMode == IDBTransaction::VERSION_CHANGE) {
+    NS_ASSERTION(dbTransactionInfo->locked, "Should be locked!");
     NS_ASSERTION(transactionCount == 1,
                  "More transactions running than should be!");
   }
@@ -343,6 +344,10 @@ TransactionThreadPool::TransactionCanRun(IDBTransaction* aTransaction,
   PRUint32 transactionCount = transactionsInProgress.Length();
   NS_ASSERTION(transactionCount, "Should never be 0!");
 
+  if (mode == IDBTransaction::VERSION_CHANGE) {
+    dbTransactionInfo->lockPending = true;
+  }
+
   for (PRUint32 index = 0; index < transactionCount; index++) {
     // See if this transaction is in out list of current transactions.
     const TransactionInfo& info = transactionsInProgress[index];
@@ -353,7 +358,11 @@ TransactionThreadPool::TransactionCanRun(IDBTransaction* aTransaction,
     }
   }
 
-  NS_ASSERTION(mode != IDBTransaction::VERSION_CHANGE, "How did we get here?");
+  if (dbTransactionInfo->locked || dbTransactionInfo->lockPending) {
+    *aCanRun = false;
+    *aExistingQueue = nsnull;
+    return NS_OK;
+  }
 
   bool writeOverlap;
   nsresult rv =
@@ -439,6 +448,11 @@ TransactionThreadPool::Dispatch(IDBTransaction* aTransaction,
     dbTransactionInfo = autoDBTransactionInfo;
   }
 
+  if (aTransaction->mMode == IDBTransaction::VERSION_CHANGE) {
+    NS_ASSERTION(!dbTransactionInfo->locked, "Already locked?!");
+    dbTransactionInfo->locked = true;
+  }
+
   const nsTArray<nsString>& objectStoreNames = aTransaction->mObjectStoreNames;
 
   nsTArray<nsString>& storesInUse =

dom/indexedDB/TransactionThreadPool.h

@@ -123,6 +123,12 @@ protected:
 
   struct DatabaseTransactionInfo
   {
+    DatabaseTransactionInfo()
+    : locked(false), lockPending(false)
+    { }
+
+    bool locked;
+    bool lockPending;
     nsTArray<TransactionInfo> transactions;
     nsTArray<nsString> storesReading;
     nsTArray<nsString> storesWriting;

dom/indexedDB/test/Makefile.in

@@ -98,7 +98,6 @@ TEST_FILES = \
   test_setVersion.html \
   test_setVersion_abort.html \
   test_setVersion_events.html \
-  test_setVersion_exclusion.html \
   test_writer_starvation.html \
   third_party_iframe1.html \
   third_party_iframe2.html \

dom/indexedDB/test/event_propagation_iframe.html

@@ -104,7 +104,7 @@
       db.onerror = errorEventCounter;
       db.addEventListener("error", errorEventCounter, true);
 
-      event.target.onsuccess = grabEventAndContinueHandler;
+      event.target.transaction.oncomplete = grabEventAndContinueHandler;
 
       db.createObjectStore("foo", { autoIncrement: true });
       yield;

dom/indexedDB/test/leaving_page_iframe.html

@@ -12,7 +12,7 @@ function startDBWork() {
     }
     var store = db.createObjectStore("mystore");
     store.add({ hello: "world" }, 42);
-    e.target.onsuccess = madeMod;
+    trans.oncomplete = madeMod;
   };
 }
 

dom/indexedDB/test/test_autoIncrement_indexes.html

@@ -33,9 +33,6 @@
 
       let key = event.target.result;
       ok(key, "Added entry");
-      request.onsuccess = grabEventAndContinueHandler;
-
-      event = yield;
 
       let objectStore = db.transaction("foo").objectStore("foo");
       let first = objectStore.index("first");

dom/indexedDB/test/test_clear.html

@@ -25,7 +25,7 @@
 
       let db = request.result;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       let objectStore = db.createObjectStore("foo", { autoIncrement: true });
 

dom/indexedDB/test/test_create_index_with_integer_keys.html

@@ -23,7 +23,7 @@
       let db = event.target.result;
       db.onerror = errorHandler;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       // Make object store, add data.
       let objectStore = db.createObjectStore("foo", { keyPath: "id" });
@@ -39,7 +39,7 @@
       let db2 = event.target.result;
       db2.onerror = errorHandler;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       // Create index.
       event.target.transaction.objectStore("foo").createIndex("foo", "num");

dom/indexedDB/test/test_cursor_mutation.html

@@ -35,7 +35,7 @@
       let event = yield;
 
       let db = event.target.result;
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       let objectStore = db.createObjectStore("foo", { keyPath: "ss" });
       objectStore.createIndex("name", "name", { unique: true });

dom/indexedDB/test/test_getAll.html

@@ -26,7 +26,6 @@
 
       let objectStore = db.createObjectStore("foo", { autoIncrement: true });
 
-      request.onsuccess = grabEventAndContinueHandler;
       request = objectStore.getAll();
       request.onerror = errorHandler;
       request.onsuccess = grabEventAndContinueHandler;
@@ -47,7 +46,6 @@
         }
       }
       yield;
-      yield;
 
       request = db.transaction("foo").objectStore("foo").getAll();
       request.onerror = errorHandler;

dom/indexedDB/test/test_index_getAll.html

@@ -60,7 +60,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -79,7 +78,7 @@
           }
         }
       }
-      yield;
+      event = yield;
       ok(true, "1");
 
       // Now create the indexes.
@@ -89,6 +88,7 @@
       }
 
       is(objectStore.indexNames.length, indexData.length, "Good index count");
+      continueToNextStep();
       yield;
 
       ok(true, "2");

dom/indexedDB/test/test_index_getAllObjects.html

@@ -60,7 +60,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -88,6 +87,7 @@
       }
 
       is(objectStore.indexNames.length, indexData.length, "Good index count");
+      continueToNextStep();
       yield;
 
       objectStore = db.transaction(objectStoreName)

dom/indexedDB/test/test_index_object_cursors.html

@@ -37,7 +37,7 @@
       let db = event.target.result;
       db.onerror = errorHandler;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       for (let objectStoreIndex in objectStoreData) {
         const objectStoreInfo = objectStoreData[objectStoreIndex];

dom/indexedDB/test/test_indexes.html

@@ -71,7 +71,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -98,6 +97,7 @@
                                 indexData[i].options);
       }
       is(objectStore.indexNames.length, indexData.length, "Good index count");
+      continueToNextStep();
       yield;
 
       objectStore = db.transaction(objectStoreName)

dom/indexedDB/test/test_indexes_bad_values.html

@@ -51,7 +51,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -88,7 +87,6 @@
         }
       }
       yield;
-      yield;
 
       objectStore = db.transaction(objectStoreName)
                       .objectStore(objectStoreName);

dom/indexedDB/test/test_object_identity.html

@@ -28,7 +28,7 @@
       let index2 = objectStore2.index("bar");
       ok(index1 === index2, "Got same indexes");
 
-      request.onsuccess = continueToNextStep;
+      transaction.oncomplete = continueToNextStep;
       yield;
 
       transaction = db.transaction("foo");

dom/indexedDB/test/test_odd_result_order.html

@@ -29,7 +29,7 @@
                                                       autoIncrement: true });
       let index = objectStore.createIndex("foo", "index");
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
       yield;
 
       objectStore = db.transaction("foo", IDBTransaction.READ_WRITE)

dom/indexedDB/test/test_open_objectStore.html

@@ -20,7 +20,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -32,6 +31,7 @@
       is(db.objectStoreNames.length, 1, "Bad objectStores list");
       is(db.objectStoreNames.item(0), objectStoreName, "Bad name");
 
+      continueToNextStep();
       yield;
 
       objectStore = db.transaction(objectStoreName).objectStore(objectStoreName);

dom/indexedDB/test/test_overlapping_transactions.html

@@ -26,7 +26,7 @@
       let db = event.target.result;
       is(db.objectStoreNames.length, 0, "Correct objectStoreNames list");
 
-      event.target.onsuccess = grabEventAndContinueHandler;
+      event.target.transaction.oncomplete = grabEventAndContinueHandler;
       for (let i in objectStores) {
         db.createObjectStore(objectStores[i], { autoIncrement: true });
       }

dom/indexedDB/test/test_readonly_transactions.html

@@ -22,7 +22,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -30,8 +29,6 @@
 
       db.createObjectStore(osName, { autoIncrement: "true" });
 
-      yield;
-
       let key1, key2;
 
       request = db.transaction([osName], READ_WRITE)

dom/indexedDB/test/test_setVersion_exclusion.html

@@ -1,90 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>Indexed Database Property Test</title>
-
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script type="text/javascript;version=1.7">
-    function testSteps()
-    {
-      const name = window.location.pathname;
-
-      let request = mozIndexedDB.open(name, 1);
-      request.onerror = errorHandler;
-      request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = unexpectedSuccessHandler;
-
-      let request2 = mozIndexedDB.open(name, 2);
-      request2.onerror = errorHandler;
-      request2.onupgradeneeded = unexpectedSuccessHandler;
-
-      let event = yield;
-      is(event.type, "upgradeneeded", "Expect an upgradeneeded event");
-      is(event.target, request, "Event should be fired on the request");
-      ok(event.target.result instanceof IDBDatabase, "Expect a database here");
-
-      let db = event.target.result;
-      is(db.version, 1, "Database has correct version");
-
-      db.onupgradeneeded = function() {
-        ok(false, "our ongoing VERSION_CHANGE transaction should exclude any others!");
-      }
-
-      db.createObjectStore("foo");
-
-      try {
-        db.transaction("foo");
-        ok(false, "Transactions should be disallowed now!");
-      } catch (e) {
-        ok(e instanceof IDBDatabaseException, "Expect an IDBException");
-        is(e.code, IDBDatabaseException.NOT_ALLOWED_ERR, "Expect a NOT_ALLOWED_ERR");
-      }
-
-      request.transaction.oncomplete = grabEventAndContinueHandler;
-
-      yield;
-
-      // The database is still not fully open here.
-      try {
-        db.transaction("foo");
-        ok(false, "Transactions should be disallowed now!");
-      } catch (e) {
-        ok(e instanceof IDBDatabaseException, "Expect an IDBException");
-        is(e.code, IDBDatabaseException.NOT_ALLOWED_ERR, "Expect a NOT_ALLOWED_ERR");
-      }
-
-      request.onsuccess = grabEventAndContinueHandler;
-
-      yield;
-
-      db.onversionchange = function() {
-        ok(true, "next setVersion was unblocked appropriately");
-        db.close();
-      }
-
-      try {
-        db.transaction("foo");
-        ok(true, "Transactions should be allowed now!");
-      } catch (e) {
-        ok(false, "Transactions should be allowed now!");
-      }
-
-      request2.onupgradeneeded = null;
-
-      finishTest();
-      yield;
-    }
-
-  </script>
-  <script type="text/javascript;version=1.7" src="helpers.js"></script>
-
-</head>
-
-<body onload="runTest();"></body>
-
-</html>

dom/indexedDB/test/test_success_events_after_abort.html

@@ -19,7 +19,7 @@
 
       let db = event.target.result;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       let objectStore = db.createObjectStore("foo");
       objectStore.add({}, 1).onerror = errorHandler;

dom/indexedDB/test/test_transaction_abort.html

@@ -29,7 +29,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -158,8 +157,6 @@
         ok(true, "RemoveIndex threw");
       }
 
-      yield;
-
       request = db.transaction("foo", READ_WRITE).objectStore("foo").add({});
       request.onerror = errorHandler;
       request.onsuccess = grabEventAndContinueHandler;

dom/indexedDB/test/test_transaction_lifetimes.html

@@ -20,7 +20,7 @@
       let db = event.target.result;
       db.onerror = errorHandler;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
 
       db.createObjectStore("foo", { autoIncrement: true });
       yield;

dom/indexedDB/test/test_transaction_lifetimes_nested.html

@@ -20,7 +20,7 @@
       let db = event.target.result;
       db.onerror = errorHandler;
 
-      event.target.onsuccess = continueToNextStep;
+      event.target.transaction.oncomplete = continueToNextStep;
       db.createObjectStore("foo");
       yield;
 

dom/indexedDB/test/test_writer_starvation.html

@@ -23,7 +23,6 @@
       let request = mozIndexedDB.open(name, 1, description);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
-      request.onsuccess = grabEventAndContinueHandler;
       let event = yield;
 
       let db = event.target.result;
@@ -40,6 +39,7 @@
       let key = event.target.result;
       ok(key, "Got a key");
 
+      SimpleTest.executeSoon(function() { testGenerator.next(); });
       yield;
 
       let continueReading = true;