1 files changed, 33 insertions, 47 deletions

diff --git a/LayoutTests/storage/indexeddb/cursor-index-delete.html b/LayoutTests/storage/indexeddb/cursor-index-delete.html
index 852a7eb..e4df903 100644
--- a/LayoutTests/storage/indexeddb/cursor-index-delete.html
+++ b/LayoutTests/storage/indexeddb/cursor-index-delete.html
@@ -18,37 +18,30 @@ test();
 
 function test()
 {
-    result = evalAndLog("webkitIndexedDB.open('name')");
-    verifyResult(result);
-    result.onsuccess = openSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("webkitIndexedDB.open('cursor-index-delete')");
+    request.onsuccess = openSuccess;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function openSuccess()
 {
-    verifySuccessEvent(event);
-    var db = evalAndLog("db = event.result");
+    var db = evalAndLog("db = event.target.result");
 
-    result = evalAndLog("db.setVersion('new version')");
-    verifyResult(result);
-    result.onsuccess = setVersionSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("db.setVersion('new version')");
+    request.onsuccess = setVersionSuccess;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function setVersionSuccess()
 {
     debug("setVersionSuccess():");
-    verifySuccessEvent(event);
-    window.trans = evalAndLog("trans = event.result");
+    window.trans = evalAndLog("trans = event.target.result");
     shouldBeTrue("trans !== null");
     trans.onabort = unexpectedAbortCallback;
     trans.oncomplete = openCursor;
 
-    deleteAllObjectStores(db, createAndPopulateObjectStoreAndIndex);
-}
+    deleteAllObjectStores(db);
 
-function createAndPopulateObjectStoreAndIndex() 
-{
     objectStore = evalAndLog("objectStore = db.createObjectStore('test')");
     evalAndLog("objectStore.createIndex('testIndex', 'x')");
 
@@ -63,33 +56,30 @@ function openCursor()
     debug("openCursor1");
     evalAndLog("trans = db.transaction(['test'], webkitIDBTransaction.READ_WRITE)");
     keyRange = webkitIDBKeyRange.lowerBound(1);
-    result = evalAndLog("trans.objectStore('test').index('testIndex').openCursor(keyRange)");
-    verifyResult(result);
-    result.onsuccess = cursorSuccess;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("trans.objectStore('test').index('testIndex').openCursor(keyRange)");
+    request.onsuccess = cursorSuccess;
+    request.onerror = unexpectedErrorCallback;
     counter = 1;
 }
 
 function cursorSuccess()
 {
-    if (event.result == null) {
+    if (event.target.result == null) {
         shouldBe("counter", "5");
-        result = evalAndLog("trans.objectStore('test').index('testIndex').openCursor(keyRange)");
-        verifyResult(result);
-        result.onsuccess = cursorEmpty;
-        result.onerror = unexpectedErrorCallback;
+        request = evalAndLog("trans.objectStore('test').index('testIndex').openCursor(keyRange)");
+        request.onsuccess = cursorEmpty;
+        request.onerror = unexpectedErrorCallback;
         return;
     }
-    var deleteResult = evalAndLog("event.result.delete()");
-    deleteResult.onerror = unexpectedErrorCallback;
-    shouldBe("event.result.key", "counter++");
-    evalAndLog("event.result.continue()");
+    var deleteRequest = evalAndLog("event.target.result.delete()");
+    deleteRequest.onerror = unexpectedErrorCallback;
+    shouldBe("event.target.result.key", "counter++");
+    evalAndLog("event.target.result.continue()");
 }
 
 function cursorEmpty()
 {
-    verifySuccessEvent(event);
-    shouldBeNull("event.result");
+    shouldBeNull("event.target.result");
     trans.oncomplete = addObject;
 }
 
@@ -97,35 +87,31 @@ function addObject()
 {
     evalAndLog("trans = db.transaction(['test'], webkitIDBTransaction.READ_WRITE)");
     objectStore = evalAndLog("objectStore = trans.objectStore('test')");
-    result = evalAndLog("objectStore.add({x: 1}, 'myKey1')");
-    verifyResult(result);
-    result.onsuccess = openCursor2;
-    result.onerror = unexpectedErrorCallback;
+    request = evalAndLog("objectStore.add({x: 1}, 'myKey1')");
+    request.onsuccess = openCursor2;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function openCursor2()
 {
     debug("openCursor2");
-    evalAndLog("index = event.source.index('testIndex')");
-    result = evalAndLog("index.openCursor(keyRange)");
-    verifyResult(result);
-    result.onsuccess = deleteObject;
-    result.onerror = unexpectedErrorCallback;
+    evalAndLog("index = event.target.source.index('testIndex')");
+    request = evalAndLog("index.openCursor(keyRange)");
+    request.onsuccess = deleteObject;
+    request.onerror = unexpectedErrorCallback;
 }
 
 function deleteObject()
 {
-    verifySuccessEvent(event);
-    shouldBeNonNull(event.result);
-    evalAndLog("event.result.delete()");
-    result = evalAndLog("index.get(1)");
-    result.onsuccess = unexpectedSuccessCallback;
-    result.onerror = verifyObjectDeleted;
+    shouldBeNonNull(event.target.result);
+    evalAndLog("event.target.result.delete()");
+    request = evalAndLog("index.get(1)");
+    request.onsuccess = unexpectedSuccessCallback;
+    request.onerror = verifyObjectDeleted;
 }
 
 function verifyObjectDeleted()
 {
-    verifyErrorEvent(event);
     evalAndLog("event.preventDefault()");
     done();
 }