diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
tree | 3863574e050f168c0126ecb47c83319fab0972d8 /LayoutTests/storage/indexeddb/objectstore-cursor.html | |
parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'LayoutTests/storage/indexeddb/objectstore-cursor.html')
-rw-r--r-- | LayoutTests/storage/indexeddb/objectstore-cursor.html | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/LayoutTests/storage/indexeddb/objectstore-cursor.html b/LayoutTests/storage/indexeddb/objectstore-cursor.html index d0d786b..3358917 100644 --- a/LayoutTests/storage/indexeddb/objectstore-cursor.html +++ b/LayoutTests/storage/indexeddb/objectstore-cursor.html @@ -16,7 +16,7 @@ if (window.layoutTestController) // In order of how it should be sorted by IndexedDB. window.testData = [ - null, + 1, 2, 3, 10, @@ -28,7 +28,7 @@ window.testData = [ function openDatabase() { - result = evalAndLog("webkitIndexedDB.open('someDB', 'some description')"); + result = evalAndLog("webkitIndexedDB.open('someDB')"); verifyResult(result); result.onsuccess = setVersion; result.onerror = unexpectedErrorCallback; @@ -70,6 +70,7 @@ function addData() result = evalAndLog("objectStore.add('', testData[nextToAdd])"); verifyResult(result); result.onsuccess = ++window.nextToAdd < testData.length ? addData : scheduleTests; + result.onerror = unexpectedErrorCallback; } function scheduleTests() @@ -158,13 +159,13 @@ function runNextTest() var keyRange; if (lower !== null && upper !== null) - keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen); + keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], {lowerOpen: lowerIsOpen, upperOpen: upperIsOpen}); else if (lower !== null) - keyRange = webkitIDBKeyRange.leftBound(testData[lower], lowerIsOpen); + keyRange = webkitIDBKeyRange.lowerBound(testData[lower], lowerIsOpen); else - keyRange = webkitIDBKeyRange.rightBound(testData[upper], upperIsOpen); + keyRange = webkitIDBKeyRange.upperBound(testData[upper], upperIsOpen); - var request = objectStore.openCursor(keyRange, ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV); + var request = objectStore.openCursor({range: keyRange, direction: ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV}); request.onsuccess = cursorIteration; request.onerror = unexpectedErrorCallback; } @@ -230,7 +231,7 @@ function testNullKeyRange() debug(""); debug(str); - var request = objectStore.openCursor(null, ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV); + var request = objectStore.openCursor({direction: ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV}); request.onsuccess = cursorIteration; request.onerror = unexpectedErrorCallback; } |