Title: [193410] trunk
- Revision
- 193410
- Author
- [email protected]
- Date
- 2015-12-03 21:55:35 -0800 (Thu, 03 Dec 2015)
Log Message
Modern IDB: storage/indexeddb/cursor-index-delete.html fails.
https://bugs.webkit.org/show_bug.cgi?id=151847
Reviewed by Andy Estes.
Source/WebCore:
No new tests (At least one failing test now passes).
* Modules/indexeddb/server/MemoryIndexCursor.cpp:
(WebCore::IDBServer::MemoryIndexCursor::MemoryIndexCursor):
(WebCore::IDBServer::MemoryIndexCursor::currentData):
LayoutTests:
* platform/mac-wk1/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (193409 => 193410)
--- trunk/LayoutTests/ChangeLog 2015-12-04 05:24:46 UTC (rev 193409)
+++ trunk/LayoutTests/ChangeLog 2015-12-04 05:55:35 UTC (rev 193410)
@@ -1,3 +1,12 @@
+2015-12-03 Brady Eidson <[email protected]>
+
+ Modern IDB: storage/indexeddb/cursor-index-delete.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=151847
+
+ Reviewed by Andy Estes.
+
+ * platform/mac-wk1/TestExpectations:
+
2015-12-03 Eric Carlson <[email protected]>
[MediaStream] Update MediaStreamTrack.getCapabilities
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193409 => 193410)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-04 05:24:46 UTC (rev 193409)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-04 05:55:35 UTC (rev 193410)
@@ -79,6 +79,7 @@
storage/indexeddb/cursor-basics.html [ Pass ]
storage/indexeddb/cursor-cast.html [ Pass ]
storage/indexeddb/cursor-finished.html [ Pass ]
+storage/indexeddb/cursor-index-delete.html [ Pass ]
storage/indexeddb/cursor-overloads.html [ Pass ]
storage/indexeddb/cursor-skip-deleted.html [ Pass ]
storage/indexeddb/modern [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (193409 => 193410)
--- trunk/Source/WebCore/ChangeLog 2015-12-04 05:24:46 UTC (rev 193409)
+++ trunk/Source/WebCore/ChangeLog 2015-12-04 05:55:35 UTC (rev 193410)
@@ -1,3 +1,16 @@
+2015-12-03 Brady Eidson <[email protected]>
+
+ Modern IDB: storage/indexeddb/cursor-index-delete.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=151847
+
+ Reviewed by Andy Estes.
+
+ No new tests (At least one failing test now passes).
+
+ * Modules/indexeddb/server/MemoryIndexCursor.cpp:
+ (WebCore::IDBServer::MemoryIndexCursor::MemoryIndexCursor):
+ (WebCore::IDBServer::MemoryIndexCursor::currentData):
+
2015-12-03 Gyuyoung Kim <[email protected]>
Reduce uses of PassRefPtr in DOM - 1
Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndexCursor.cpp (193409 => 193410)
--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndexCursor.cpp 2015-12-04 05:24:46 UTC (rev 193409)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndexCursor.cpp 2015-12-04 05:55:35 UTC (rev 193410)
@@ -46,15 +46,14 @@
if (!valueStore)
return;
- IndexValueStore::Iterator iterator;
if (m_info.isDirectionForward())
- iterator = valueStore->find(m_info.range().lowerKey, m_info.range().lowerOpen);
+ m_currentIterator = valueStore->find(m_info.range().lowerKey, m_info.range().lowerOpen);
else
- iterator = valueStore->reverseFind(m_info.range().upperKey, m_info.duplicity(), m_info.range().upperOpen);
+ m_currentIterator = valueStore->reverseFind(m_info.range().upperKey, m_info.duplicity(), m_info.range().upperOpen);
- if (iterator.isValid()) {
- m_currentKey = iterator.key();
- m_currentPrimaryKey = iterator.primaryKey();
+ if (m_currentIterator.isValid()) {
+ m_currentKey = m_currentIterator.key();
+ m_currentPrimaryKey = m_currentIterator.primaryKey();
m_index.cursorDidBecomeClean(*this);
}
}
@@ -65,6 +64,11 @@
void MemoryIndexCursor::currentData(IDBGetResult& getResult)
{
+ if (!m_currentIterator.isValid()) {
+ getResult = { };
+ return;
+ }
+
if (m_info.cursorType() == IndexedDB::CursorType::KeyOnly)
getResult = { m_currentKey, m_currentPrimaryKey };
else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
