Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f

* changes:
  Merge WebKit at r78450: Update ThirdPartyProject.prop
  Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
  Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
  Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
  Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
  Merge WebKit at r78450: FrameLoader::url() removed
  Merge WebKit at r78450: HTMLParserQuirks removed
  Merge WebKit at r78450: TextRun::padding() renamed
  Merge WebKit at r78450: Use new FontMetrics
  Merge WebKit at r78450: GraphicsContext current path removed
  Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
  Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
  Merge WebKit at r78450: IntRect::bottom()/right() renamed
  Merge WebKit at r78450: Fix remaining conflicts
  Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
  Merge WebKit at r78450: Fix conflicts in media controls
  Merge WebKit at r78450: Fix Makefiles
  Merge WebKit at r78450: Initial merge by git.

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);