Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 35 insertions, 26 deletions

diff --git a/LayoutTests/storage/indexeddb/request-event-propagation.html b/LayoutTests/storage/indexeddb/request-event-propagation.html
index 87f6a2d..3b1da3b 100644
--- a/LayoutTests/storage/indexeddb/request-event-propagation.html
+++ b/LayoutTests/storage/indexeddb/request-event-propagation.html
@@ -16,40 +16,33 @@ if (window.layoutTestController)
 
 function test()
 {
-    result = evalAndLog("webkitIndexedDB.open('name')");
-    verifyResult(result);
-    result.onsuccess = setVersion;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("webkitIndexedDB.open('request-event-propagation')");
+    request.onsuccess = setVersion;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function setVersion()
 {
-    verifySuccessEvent(event);
-    db = evalAndLog("db = event.result");
+    db = evalAndLog("db = event.target.result");
 
-    result = evalAndLog("db.setVersion('new version')");
-    verifyResult(result);
-    result.onsuccess = deleteExisting;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("db.setVersion('new version')");
+    request.onsuccess = deleteExisting;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function deleteExisting()
 {
     debug("setVersionSuccess():");
-    verifySuccessEvent(event);
-    window.trans = evalAndLog("trans = event.result");
+    window.trans = evalAndLog("trans = event.target.result");
     shouldBeTrue("trans !== null");
     trans.onabort = unexpectedAbortCallback;
     evalAndLog("trans.oncomplete = startTest");
 
-    deleteAllObjectStores(db, createObjectStore);
-}
+    deleteAllObjectStores(db);
 
-function createObjectStore()
-{
     store = evalAndLog("store = db.createObjectStore('storeName', null)");
-    result = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
+    request.onerror = unexpectedErrorCallback;
 }
 
 function startTest()
@@ -60,8 +53,8 @@ function startTest()
     evalAndLog("trans.oncomplete = unexpectedCompleteCallback");
     evalAndLog("trans.onerror = allowDefault");
     store = evalAndLog("store = trans.objectStore('storeName')");
-    result = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
-    result.onsuccess = unexpectedSuccessCallback;
+    request = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
+    request.onsuccess = unexpectedSuccessCallback;
     handlerFired = false;
 }
 
@@ -89,9 +82,9 @@ function transactionAborted()
     evalAndLog("db.addEventListener('success', unexpectedSuccessCallback, true)");
     evalAndLog("db.addEventListener('success', unexpectedSuccessCallback, false)");
     store = evalAndLog("store = trans.objectStore('storeName')");
-    result = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
-    result.onsuccess = unexpectedSuccessCallback;
-    result.onerror = errorFiredCallback;
+    request = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')");
+    request.onsuccess = unexpectedSuccessCallback;
+    request.onerror = errorFiredCallback;
     dbCaptureFired = false;
     captureFired = false;
     requestFired = false;
@@ -108,6 +101,8 @@ function dbErrorCaptureCallback()
     shouldBeFalse("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "db");
     dbCaptureFired = true;
 }
 
@@ -120,6 +115,8 @@ function errorCaptureCallback()
     shouldBeFalse("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "trans");
     captureFired = true;
 }
 
@@ -132,6 +129,8 @@ function errorFiredCallback()
     shouldBeFalse("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "request");
     requestFired = true;
 }
 
@@ -144,6 +143,8 @@ function errorBubbleCallback()
     shouldBeTrue("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "trans");
     bubbleFired = true;
 }
 
@@ -156,6 +157,8 @@ function dbErrorBubbleCallback()
     shouldBeTrue("requestFired");
     shouldBeTrue("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "db");
     dbBubbleFired = true;
 }
 
@@ -186,9 +189,9 @@ function transactionAborted2()
     evalAndLog("db.addEventListener('error', unexpectedErrorCallback, true)");
     evalAndLog("db.addEventListener('error', unexpectedErrorCallback, false)");
     store = evalAndLog("store = trans.objectStore('storeName')");
-    result = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key2')");
-    result.onerror = unexpectedErrorCallback;
-    result.onsuccess = successFiredCallback;
+    request = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key2')");
+    request.onerror = unexpectedErrorCallback;
+    request.onsuccess = successFiredCallback;
     dbCaptureFired = false;
     captureFired = false;
     requestFired = false;
@@ -205,6 +208,8 @@ function dbSuccessCaptureCallback()
     shouldBeFalse("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "db");
     dbCaptureFired = true;
 }
 
@@ -217,6 +222,8 @@ function successCaptureCallback()
     shouldBeFalse("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "trans");
     captureFired = true;
 }
 
@@ -229,6 +236,8 @@ function successFiredCallback()
     shouldBeFalse("requestFired");
     shouldBeFalse("bubbleFired");
     shouldBeFalse("dbBubbleFired");
+    shouldBe("event.target", "request");
+    shouldBe("event.currentTarget", "request");
     requestFired = true;
 }