Title: [193801] trunk
- Revision
- 193801
- Author
- beid...@apple.com
- Date
- 2015-12-08 17:59:07 -0800 (Tue, 08 Dec 2015)
Log Message
Modern IDB: storage/indexeddb/objectstore-cursor.html fails.
https://bugs.webkit.org/show_bug.cgi?id=152023
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (At least one failing test now passes).
* Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
(WebCore::IDBServer::MemoryObjectStoreCursor::MemoryObjectStoreCursor):
(WebCore::IDBServer::MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange): Make sure the
found iterator is actually in the target range.
LayoutTests:
* platform/mac-wk1/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (193800 => 193801)
--- trunk/LayoutTests/ChangeLog 2015-12-09 01:58:52 UTC (rev 193800)
+++ trunk/LayoutTests/ChangeLog 2015-12-09 01:59:07 UTC (rev 193801)
@@ -1,3 +1,12 @@
+2015-12-08 Brady Eidson <beid...@apple.com>
+
+ Modern IDB: storage/indexeddb/objectstore-cursor.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=152023
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
2015-12-08 Ryan Haddad <ryanhad...@apple.com>
Skipping fast/canvas/canvas-too-large-to-draw.html on win
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193800 => 193801)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-09 01:58:52 UTC (rev 193800)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-09 01:59:07 UTC (rev 193801)
@@ -116,7 +116,6 @@
storage/indexeddb/objectstore-autoincrement.html [ Failure ]
storage/indexeddb/objectstore-basics.html [ Failure ]
storage/indexeddb/objectstore-count.html [ Failure ]
-storage/indexeddb/objectstore-cursor.html [ Failure ]
storage/indexeddb/open-cursor.html [ Failure ]
storage/indexeddb/open-db-private-browsing.html [ Failure ]
storage/indexeddb/open-ordering.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (193800 => 193801)
--- trunk/Source/WebCore/ChangeLog 2015-12-09 01:58:52 UTC (rev 193800)
+++ trunk/Source/WebCore/ChangeLog 2015-12-09 01:59:07 UTC (rev 193801)
@@ -1,3 +1,17 @@
+2015-12-08 Brady Eidson <beid...@apple.com>
+
+ Modern IDB: storage/indexeddb/objectstore-cursor.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=152023
+
+ Reviewed by Alex Christensen.
+
+ No new tests (At least one failing test now passes).
+
+ * Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
+ (WebCore::IDBServer::MemoryObjectStoreCursor::MemoryObjectStoreCursor):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange): Make sure the
+ found iterator is actually in the target range.
+
2015-12-08 Jer Noble <jer.no...@apple.com>
Changing <video> src during 'ended' event can leave screen sleep disabled
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp (193800 => 193801)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp 2015-12-09 01:58:52 UTC (rev 193800)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp 2015-12-09 01:59:07 UTC (rev 193801)
@@ -37,8 +37,9 @@
MemoryObjectStoreCursor::MemoryObjectStoreCursor(MemoryObjectStore& objectStore, const IDBCursorInfo& info)
: MemoryCursor(info)
, m_objectStore(objectStore)
+ , m_remainingRange(info.range())
{
- m_remainingRange = m_info.range();
+ LOG(IndexedDB, "MemoryObjectStoreCursor::MemoryObjectStoreCursor %s", info.range().loggingString().utf8().data());
auto* orderedKeys = objectStore.orderedKeys();
if (!orderedKeys)
@@ -145,6 +146,9 @@
if (!m_remainingRange.upperKey.isValid()) {
m_iterator = --set.end();
+ if (!m_remainingRange.containsKey(**m_iterator))
+ m_iterator = Nullopt;
+
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
