1 files changed, 23 insertions, 27 deletions

diff --git a/LayoutTests/storage/indexeddb/index-cursor.html b/LayoutTests/storage/indexeddb/index-cursor.html
index 9541d60..5aab4f8 100644
--- a/LayoutTests/storage/indexeddb/index-cursor.html
+++ b/LayoutTests/storage/indexeddb/index-cursor.html
@@ -10,7 +10,7 @@
 <div id="console"></div>
 <script> 
 
-description("Test IndexedDB's IDBIndex.openCursor + the cursor it produces in depth.");
+description("Test IndexedDB's webkitIDBIndex.openCursor + the cursor it produces in depth.");
 if (window.layoutTestController)
     layoutTestController.waitUntilDone();
  
@@ -29,49 +29,45 @@ window.testData = [
  
 function openDatabase()
 {
-    result = evalAndLog("indexedDB.open('someDB', 'some description')");
+    result = evalAndLog("webkitIndexedDB.open('someDB', 'some description')");
     verifyResult(result);
-    result.onsuccess = openObjectStore;
+    result.onsuccess = setVersion;
     result.onerror = unexpectedErrorCallback;
 }
  
-function openObjectStore()
+function setVersion()
 {
     verifySuccessEvent(event);
     window.db = evalAndLog("db = event.result");
 
-    deleteAllObjectStores(db);
-
-    result = evalAndLog("db.createObjectStore('someObjectStore')");
+    result = evalAndLog("db.setVersion('new version')");
     verifyResult(result);
-    result.onsuccess = openIndex;
+    result.onsuccess = deleteExisting;
     result.onerror = unexpectedErrorCallback;
 }
 
-function openIndex()
+function deleteExisting()
 {
     verifySuccessEvent(event);
-    window.objectStore = evalAndLog("objectStore = event.result");
+    window.trans = evalAndLog("trans = event.result");
+    shouldBeTrue("trans !== null");
+    trans.onabort = unexpectedAbortCallback;
 
-    result = evalAndLog("objectStore.createIndex('someIndex', 'x')");
-    verifyResult(result);
-    result.onsuccess = startAddingData;
-    result.onerror = unexpectedErrorCallback;
+    deleteAllObjectStores(db, startAddingData);
 }
  
 function startAddingData()
 {
-    verifySuccessEvent(event);
-    window.indexObject = evalAndLog("indexObject = event.result");
-
+    window.objectStore = evalAndLog("db.createObjectStore('someObjectStore')");
+    window.indexObject = evalAndLog("objectStore.createIndex('someIndex', 'x')");
     window.nextToAdd = 0;
     addData();
 }
 
 function addData()
 {
-    // We cheat when called for the first time; we're in the context of the objectStore success event.
-    verifySuccessEvent(event);
+    if (window.nextToAdd > 0)
+        verifySuccessEvent(event);
 
     result = evalAndLog("objectStore.add({'x': testData[nextToAdd]}, nextToAdd)");
     verifyResult(result);
@@ -105,7 +101,7 @@ function scheduleTests()
     }
  
     debug("Running tests...");
-    setTimeout(runNextTest, 0);
+    runNextTest();
 }
  
 function runNextTest()
@@ -184,13 +180,13 @@ function runNextTest()
  
     var keyRange;
     if (lower !== null && upper !== null)
-        keyRange = IDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
+        keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
     else if (lower !== null)
-        keyRange = IDBKeyRange.leftBound(testData[lower], lowerIsOpen);
+        keyRange = webkitIDBKeyRange.leftBound(testData[lower], lowerIsOpen);
     else
-        keyRange = IDBKeyRange.rightBound(testData[upper], upperIsOpen);
+        keyRange = webkitIDBKeyRange.rightBound(testData[upper], upperIsOpen);
  
-    var request = indexObject.openCursor(keyRange, ascending ? IDBCursor.NEXT : IDBCursor.PREV);
+    var request = indexObject.openKeyCursor(keyRange, ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV);
     request.onsuccess = cursorIteration;
     request.onerror = unexpectedErrorCallback;
 }
@@ -213,12 +209,12 @@ function cursorIteration()
 {
     if (expectedIndex === null) {
         shouldBeNull("event.result");
-        setTimeout(runNextTest, 0);
+        runNextTest();
         return;
     }
     if (event.result === null) {
-        testFailed("Event.result should not be null.")
-        setTimeout(runNextTest, 0);
+        testFailed("Event.result should not be null.");
+        runNextTest();
         return;
     }