Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

1 files changed, 3 insertions, 3 deletions

diff --git a/LayoutTests/storage/indexeddb/transaction-basics.html b/LayoutTests/storage/indexeddb/transaction-basics.html
index 8995e6d..9626129 100644
--- a/LayoutTests/storage/indexeddb/transaction-basics.html
+++ b/LayoutTests/storage/indexeddb/transaction-basics.html
@@ -55,7 +55,7 @@ function addRemoveIDBObjects()
     verifySuccessEvent(event);

     var trans = evalAndLog("trans = event.result");

     shouldBeTrue("trans !== null");

-    trans.onabort = testSetVersionAbort2;

+    trans.addEventListener('abort', testSetVersionAbort2, true);

     trans.oncomplete = unexpectedCompleteCallback;

 

     var store = evalAndLog("store = db.createObjectStore('storeFail', null)");

@@ -80,7 +80,7 @@ function addRemoveAddIDBObjects()
     verifySuccessEvent(event);

     var trans = evalAndLog("trans = event.result");

     shouldBeTrue("trans !== null");

-    trans.onabort = testSetVersionAbort3;

+    trans.addEventListener('abort', testSetVersionAbort3, false);

     trans.oncomplete = unexpectedCompleteCallback;

 

     var store = evalAndLog("store = db.createObjectStore('storeFail', null)");

@@ -209,7 +209,7 @@ function setVersionSuccess()
     window.trans = evalAndLog("trans = event.result");

     shouldBeTrue("trans !== null");

     trans.onabort = unexpectedAbortCallback;

-    trans.oncomplete = completeCallback;

+    trans.addEventListener('complete', completeCallback, false);

     window.completeEventFired = false;

 

     deleteAllObjectStores(db, createObjectStoreAndStartTransaction);