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/index-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/index-cursor.html')
-rw-r--r-- | LayoutTests/storage/indexeddb/index-cursor.html | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/LayoutTests/storage/indexeddb/index-cursor.html b/LayoutTests/storage/indexeddb/index-cursor.html index 6a9d1ac..fb3147d 100644 --- a/LayoutTests/storage/indexeddb/index-cursor.html +++ b/LayoutTests/storage/indexeddb/index-cursor.html @@ -16,8 +16,8 @@ if (window.layoutTestController) // In order of how it should be sorted by IndexedDB. window.testData = [ - null, - null, + 1, + 1, 2, 2, 10, @@ -29,7 +29,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; @@ -72,6 +72,7 @@ function addData() result = evalAndLog("objectStore.add({'x': testData[nextToAdd]}, nextToAdd)"); verifyResult(result); result.onsuccess = ++window.nextToAdd < testData.length ? addData : scheduleTests; + result.onerror = unexpectedErrorCallback; } function scheduleTests() @@ -180,13 +181,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 = indexObject.openKeyCursor(keyRange, ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV); + var request = indexObject.openKeyCursor({range: keyRange, direction: ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV}); request.onsuccess = cursorIteration; request.onerror = unexpectedErrorCallback; } @@ -253,7 +254,7 @@ function testNullKeyRange() debug(""); debug(str); - var request = indexObject.openKeyCursor(null, ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV); + var request = indexObject.openKeyCursor({direction: ascending ? webkitIDBCursor.NEXT : webkitIDBCursor.PREV}); request.onsuccess = cursorIteration; request.onerror = unexpectedErrorCallback; } |