<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193360] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193360">193360</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:52:52 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
Modern IDB: storage/indexeddb/cursor-skip-deleted.html crashes.
https://bugs.webkit.org/show_bug.cgi?id=151794
Reviewed by Alex Christensen.
STL reverse_iterators are a tricky beast.
They are implemented in terms of a normal forward iterator (called the "base" iterator),
and they decrement a copy of that iterator when dereferenced.
So when monitoring deletes from a std::set to check if we should invalidate our current
reverse_iterator, we were incorrectly comparing the deleted key to the value pointed by the
reverse_iterator instead of its base iterator.
Since the iterators in question are bidirectional, anyways, we can just use a single iterator
and either increment or decrement it as needed.
No new tests (At least one failing (crashing) test now passes).
* Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
(WebCore::IDBServer::MemoryObjectStoreCursor::objectStoreCleared):
(WebCore::IDBServer::MemoryObjectStoreCursor::keyDeleted):
(WebCore::IDBServer::MemoryObjectStoreCursor::keyAdded):
(WebCore::IDBServer::MemoryObjectStoreCursor::setFirstInRemainingRange):
(WebCore::IDBServer::MemoryObjectStoreCursor::setForwardIteratorFromRemainingRange):
(WebCore::IDBServer::MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange):
(WebCore::IDBServer::MemoryObjectStoreCursor::currentData):
(WebCore::IDBServer::MemoryObjectStoreCursor::incrementForwardIterator):
(WebCore::IDBServer::MemoryObjectStoreCursor::incrementReverseIterator):
(WebCore::IDBServer::MemoryObjectStoreCursor::iterate):
(WebCore::IDBServer::MemoryObjectStoreCursor::firstForwardIteratorInRemainingRange): Deleted.
(WebCore::IDBServer::MemoryObjectStoreCursor::firstReverseIteratorInRemainingRange): Deleted.
(WebCore::IDBServer::MemoryObjectStoreCursor::hasIterators): Deleted.
(WebCore::IDBServer::MemoryObjectStoreCursor::hasValidPosition): Deleted.
(WebCore::IDBServer::MemoryObjectStoreCursor::clearIterators): Deleted.
* Modules/indexeddb/server/MemoryObjectStoreCursor.h:
LayoutTests:
Modern IDB: storage/indexeddb/cursor-skip-deleted.html fails.
https://bugs.webkit.org/show_bug.cgi?id=151794
Reviewed by Alex Christensen.
* platform/mac-wk1/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorcpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193359 => 193360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-03 19:41:26 UTC (rev 193359)
+++ trunk/LayoutTests/ChangeLog 2015-12-03 19:52:52 UTC (rev 193360)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-12-03 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/cursor-skip-deleted.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=151794
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2015-12-02 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Promise callbacks should be called at microtask checkpoints
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193359 => 193360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-03 19:41:26 UTC (rev 193359)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-03 19:52:52 UTC (rev 193360)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> storage/indexeddb/cursor-cast.html [ Pass ]
</span><span class="cx"> storage/indexeddb/cursor-finished.html [ Pass ]
</span><span class="cx"> storage/indexeddb/cursor-overloads.html [ Pass ]
</span><ins>+storage/indexeddb/cursor-skip-deleted.html [ Pass ]
</ins><span class="cx"> storage/indexeddb/modern [ Pass ]
</span><span class="cx"> storage/indexeddb/mozilla [ Pass ]
</span><span class="cx"> storage/indexeddb/transaction-abort.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193359 => 193360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-03 19:41:26 UTC (rev 193359)
+++ trunk/Source/WebCore/ChangeLog 2015-12-03 19:52:52 UTC (rev 193360)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-12-03 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/cursor-skip-deleted.html crashes.
+ https://bugs.webkit.org/show_bug.cgi?id=151794
+
+ Reviewed by Alex Christensen.
+
+ STL reverse_iterators are a tricky beast.
+
+ They are implemented in terms of a normal forward iterator (called the "base" iterator),
+ and they decrement a copy of that iterator when dereferenced.
+
+ So when monitoring deletes from a std::set to check if we should invalidate our current
+ reverse_iterator, we were incorrectly comparing the deleted key to the value pointed by the
+ reverse_iterator instead of its base iterator.
+
+ Since the iterators in question are bidirectional, anyways, we can just use a single iterator
+ and either increment or decrement it as needed.
+
+ No new tests (At least one failing (crashing) test now passes).
+
+ * Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
+ (WebCore::IDBServer::MemoryObjectStoreCursor::objectStoreCleared):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::keyDeleted):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::keyAdded):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setFirstInRemainingRange):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setForwardIteratorFromRemainingRange):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::currentData):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::incrementForwardIterator):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::incrementReverseIterator):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::iterate):
+ (WebCore::IDBServer::MemoryObjectStoreCursor::firstForwardIteratorInRemainingRange): Deleted.
+ (WebCore::IDBServer::MemoryObjectStoreCursor::firstReverseIteratorInRemainingRange): Deleted.
+ (WebCore::IDBServer::MemoryObjectStoreCursor::hasIterators): Deleted.
+ (WebCore::IDBServer::MemoryObjectStoreCursor::hasValidPosition): Deleted.
+ (WebCore::IDBServer::MemoryObjectStoreCursor::clearIterators): Deleted.
+ * Modules/indexeddb/server/MemoryObjectStoreCursor.h:
+
</ins><span class="cx"> 2015-12-03 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo][MediaFoundation] Main thread can block when session is destroyed.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp (193359 => 193360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp 2015-12-03 19:41:26 UTC (rev 193359)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp 2015-12-03 19:52:52 UTC (rev 193360)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::objectStoreCleared()
</span><span class="cx"> {
</span><del>- clearIterators();
</del><ins>+ m_iterator = Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::keyDeleted(const IDBKeyData& key)
</span><span class="lines">@@ -57,133 +57,135 @@
</span><span class="cx"> if (m_currentPositionKey != key)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- clearIterators();
</del><ins>+ m_iterator = Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::keyAdded(std::set<IDBKeyData>::iterator iterator)
</span><span class="cx"> {
</span><del>- if (hasIterators())
</del><ins>+ if (m_iterator)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (*iterator != m_currentPositionKey)
- return;
-
- if (m_info.isDirectionForward())
- m_forwardIterator = iterator;
- else
- m_reverseIterator = --std::set<IDBKeyData>::reverse_iterator(iterator);
</del><ins>+ if (*iterator == m_currentPositionKey)
+ m_iterator = iterator;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::setFirstInRemainingRange(std::set<IDBKeyData>& set)
</span><span class="cx"> {
</span><del>- clearIterators();
</del><ins>+ m_iterator = Nullopt;
</ins><span class="cx">
</span><span class="cx"> if (m_info.isDirectionForward()) {
</span><del>- m_forwardIterator = firstForwardIteratorInRemainingRange(set);
- if (*m_forwardIterator != set.end()) {
- m_remainingRange.lowerKey = **m_forwardIterator;
</del><ins>+ setForwardIteratorFromRemainingRange(set);
+ if (m_iterator) {
+ m_remainingRange.lowerKey = **m_iterator;
</ins><span class="cx"> m_remainingRange.lowerOpen = true;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- m_reverseIterator = firstReverseIteratorInRemainingRange(set);
- if (*m_reverseIterator != set.rend()) {
- m_remainingRange.upperKey = **m_reverseIterator;
</del><ins>+ setReverseIteratorFromRemainingRange(set);
+ if (m_iterator) {
+ m_remainingRange.upperKey = **m_iterator;
</ins><span class="cx"> m_remainingRange.upperOpen = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ ASSERT(!m_iterator || *m_iterator != set.end());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::set<IDBKeyData>::iterator MemoryObjectStoreCursor::firstForwardIteratorInRemainingRange(std::set<IDBKeyData>& set)
</del><ins>+void MemoryObjectStoreCursor::setForwardIteratorFromRemainingRange(std::set<IDBKeyData>& set)
</ins><span class="cx"> {
</span><del>- if (m_remainingRange.isExactlyOneKey())
- return set.find(m_remainingRange.lowerKey);
</del><ins>+ if (!set.size()) {
+ m_iterator = Nullopt;
+ return;
+ }
</ins><span class="cx">
</span><ins>+ if (m_remainingRange.isExactlyOneKey()) {
+ m_iterator = set.find(m_remainingRange.lowerKey);
+ if (*m_iterator == set.end())
+ m_iterator = Nullopt;
+
+ return;
+ }
+
+ m_iterator = Nullopt;
+
</ins><span class="cx"> auto lowest = set.lower_bound(m_remainingRange.lowerKey);
</span><span class="cx"> if (lowest == set.end())
</span><del>- return lowest;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> if (m_remainingRange.lowerOpen && *lowest == m_remainingRange.lowerKey) {
</span><span class="cx"> ++lowest;
</span><span class="cx"> if (lowest == set.end())
</span><del>- return lowest;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_remainingRange.upperKey.isNull()) {
</span><span class="cx"> if (lowest->compare(m_remainingRange.upperKey) > 0)
</span><del>- return set.end();
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> if (m_remainingRange.upperOpen && *lowest == m_remainingRange.upperKey)
</span><del>- return set.end();
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return lowest;
</del><ins>+ m_iterator = lowest;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::set<IDBKeyData>::reverse_iterator MemoryObjectStoreCursor::firstReverseIteratorInRemainingRange(std::set<IDBKeyData>& set)
</del><ins>+void MemoryObjectStoreCursor::setReverseIteratorFromRemainingRange(std::set<IDBKeyData>& set)
</ins><span class="cx"> {
</span><ins>+ if (!set.size()) {
+ m_iterator = Nullopt;
+ return;
+ }
+
</ins><span class="cx"> if (m_remainingRange.isExactlyOneKey()) {
</span><del>- auto iterator = set.find(m_remainingRange.lowerKey);
- if (iterator == set.end())
- return set.rend();
</del><ins>+ m_iterator = set.find(m_remainingRange.lowerKey);
+ if (*m_iterator == set.end())
+ m_iterator = Nullopt;
</ins><span class="cx">
</span><del>- return --std::set<IDBKeyData>::reverse_iterator(iterator);
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_remainingRange.upperKey.isValid())
- return set.rbegin();
</del><ins>+ if (!m_remainingRange.upperKey.isValid()) {
+ m_iterator = --set.end();
+ return;
+ }
</ins><span class="cx">
</span><ins>+ m_iterator = Nullopt;
+
</ins><span class="cx"> // This is one record past the actual key we're looking for.
</span><span class="cx"> auto highest = set.upper_bound(m_remainingRange.upperKey);
</span><span class="cx">
</span><ins>+ if (highest == set.begin())
+ return;
+
</ins><span class="cx"> // This is one record before that, which *is* the key we're looking for.
</span><del>- auto reverse = std::set<IDBKeyData>::reverse_iterator(highest);
- if (reverse == set.rend())
- return reverse;
</del><ins>+ --highest;
</ins><span class="cx">
</span><del>- if (m_remainingRange.upperOpen && *reverse == m_remainingRange.upperKey) {
- ++reverse;
- if (reverse == set.rend())
- return reverse;
</del><ins>+ if (m_remainingRange.upperOpen && *highest == m_remainingRange.upperKey) {
+ if (highest == set.begin())
+ return;
+ --highest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_remainingRange.lowerKey.isNull()) {
</span><del>- if (reverse->compare(m_remainingRange.lowerKey) < 0)
- return set.rend();
</del><ins>+ if (highest->compare(m_remainingRange.lowerKey) < 0)
+ return;
</ins><span class="cx">
</span><del>- if (m_remainingRange.lowerOpen && *reverse == m_remainingRange.lowerKey)
- return set.rend();
</del><ins>+ if (m_remainingRange.lowerOpen && *highest == m_remainingRange.lowerKey)
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return reverse;
</del><ins>+ m_iterator = highest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::currentData(IDBGetResult& data)
</span><span class="cx"> {
</span><del>- if (!hasIterators()) {
</del><ins>+ if (!m_iterator) {
</ins><span class="cx"> m_currentPositionKey = { };
</span><span class="cx"> data = { };
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto* set = m_objectStore.orderedKeys();
- ASSERT(set);
- if (m_info.isDirectionForward()) {
- if (!m_forwardIterator || *m_forwardIterator == set->end()) {
- data = { };
- return;
- }
-
- m_currentPositionKey = **m_forwardIterator;
- data = { **m_forwardIterator, **m_forwardIterator, m_objectStore.valueForKeyRange(**m_forwardIterator) };
- } else {
- if (!m_reverseIterator || *m_reverseIterator == set->rend()) {
- data = { };
- return;
- }
-
- m_currentPositionKey = **m_reverseIterator;
- data = { **m_reverseIterator, **m_reverseIterator, m_objectStore.valueForKeyRange(**m_reverseIterator) };
- }
</del><ins>+ m_currentPositionKey = **m_iterator;
+ data = { m_currentPositionKey, m_currentPositionKey, m_objectStore.valueForKeyRange(m_currentPositionKey) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryObjectStoreCursor::incrementForwardIterator(std::set<IDBKeyData>& set, const IDBKeyData& key, uint32_t count)
</span><span class="lines">@@ -191,7 +193,7 @@
</span><span class="cx"> // We might need to re-grab the current iterator.
</span><span class="cx"> // e.g. If the record it was pointed to had been deleted.
</span><span class="cx"> bool didResetIterator = false;
</span><del>- if (!hasIterators()) {
</del><ins>+ if (!m_iterator) {
</ins><span class="cx"> if (!m_currentPositionKey.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -202,9 +204,11 @@
</span><span class="cx"> didResetIterator = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (*m_forwardIterator == set.end())
</del><ins>+ if (!m_iterator)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(*m_iterator != set.end());
+
</ins><span class="cx"> if (key.isValid()) {
</span><span class="cx"> // If iterating to a key, the count passed in must be zero, as there is no way to iterate by both a count and to a key.
</span><span class="cx"> ASSERT(!count);
</span><span class="lines">@@ -212,7 +216,7 @@
</span><span class="cx"> if (!m_info.range().containsKey(key))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ((*m_forwardIterator)->compare(key) < 0) {
</del><ins>+ if ((*m_iterator)->compare(key) < 0) {
</ins><span class="cx"> m_remainingRange.lowerKey = key;
</span><span class="cx"> m_remainingRange.lowerOpen = false;
</span><span class="cx"> setFirstInRemainingRange(set);
</span><span class="lines">@@ -226,20 +230,16 @@
</span><span class="cx">
</span><span class="cx"> // If the forwardIterator was reset because it's previous record had been deleted,
</span><span class="cx"> // we might have already advanced past the current position, eating one one of the iteration counts.
</span><del>- if (didResetIterator && (*m_forwardIterator)->compare(m_currentPositionKey) > 0)
</del><ins>+ if (didResetIterator && (*m_iterator)->compare(m_currentPositionKey) > 0)
</ins><span class="cx"> --count;
</span><span class="cx">
</span><span class="cx"> while (count) {
</span><span class="cx"> --count;
</span><ins>+ ++*m_iterator;
</ins><span class="cx">
</span><del>- ++*m_forwardIterator;
-
- if (*m_forwardIterator == set.end())
</del><ins>+ if (*m_iterator == set.end() || !m_info.range().containsKey(**m_iterator)) {
+ m_iterator = Nullopt;
</ins><span class="cx"> return;
</span><del>-
- if (!m_info.range().containsKey(**m_forwardIterator)) {
- m_forwardIterator = set.end();
- return;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> // We might need to re-grab the current iterator.
</span><span class="cx"> // e.g. If the record it was pointed to had been deleted.
</span><span class="cx"> bool didResetIterator = false;
</span><del>- if (!hasIterators()) {
</del><ins>+ if (!m_iterator) {
</ins><span class="cx"> if (!m_currentPositionKey.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> didResetIterator = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (*m_reverseIterator == set.rend())
</del><ins>+ if (*m_iterator == set.end())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (key.isValid()) {
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> if (!m_info.range().containsKey(key))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ((*m_reverseIterator)->compare(key) > 0) {
</del><ins>+ if ((*m_iterator)->compare(key) > 0) {
</ins><span class="cx"> m_remainingRange.upperKey = key;
</span><span class="cx"> m_remainingRange.upperOpen = false;
</span><span class="cx">
</span><span class="lines">@@ -285,50 +285,25 @@
</span><span class="cx">
</span><span class="cx"> // If the reverseIterator was reset because it's previous record had been deleted,
</span><span class="cx"> // we might have already advanced past the current position, eating one one of the iteration counts.
</span><del>- if (didResetIterator && (*m_reverseIterator)->compare(m_currentPositionKey) < 0)
</del><ins>+ if (didResetIterator && (*m_iterator)->compare(m_currentPositionKey) < 0)
</ins><span class="cx"> --count;
</span><span class="cx">
</span><span class="cx"> while (count) {
</span><ins>+ if (*m_iterator == set.begin()) {
+ m_iterator = Nullopt;
+ return;
+ }
+
</ins><span class="cx"> --count;
</span><ins>+ --*m_iterator;
</ins><span class="cx">
</span><del>- ++*m_reverseIterator;
-
- if (*m_reverseIterator == set.rend())
</del><ins>+ if (!m_info.range().containsKey(**m_iterator)) {
+ m_iterator = Nullopt;
</ins><span class="cx"> return;
</span><del>-
- if (!m_info.range().containsKey(**m_reverseIterator)) {
- m_reverseIterator = set.rend();
- return;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MemoryObjectStoreCursor::hasIterators() const
-{
- return m_forwardIterator || m_reverseIterator;
-}
-
-bool MemoryObjectStoreCursor::hasValidPosition() const
-{
- if (!hasIterators())
- return false;
-
- auto* set = m_objectStore.orderedKeys();
- if (!set)
- return false;
-
- if (m_info.isDirectionForward())
- return *m_forwardIterator != set->end();
-
- return *m_reverseIterator != set->rend();
-}
-
-void MemoryObjectStoreCursor::clearIterators()
-{
- m_forwardIterator = Nullopt;
- m_reverseIterator = Nullopt;
-}
-
</del><span class="cx"> void MemoryObjectStoreCursor::iterate(const IDBKeyData& key, uint32_t count, IDBGetResult& outData)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "MemoryObjectStoreCursor::iterate to key %s", key.loggingString().utf8().data());
</span><span class="lines">@@ -355,7 +330,7 @@
</span><span class="cx">
</span><span class="cx"> m_currentPositionKey = { };
</span><span class="cx">
</span><del>- if (!hasValidPosition()) {
</del><ins>+ if (!m_iterator) {
</ins><span class="cx"> outData = { };
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h (193359 => 193360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h 2015-12-03 19:41:26 UTC (rev 193359)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h 2015-12-03 19:52:52 UTC (rev 193360)
</span><span class="lines">@@ -52,22 +52,19 @@
</span><span class="cx"> virtual void iterate(const IDBKeyData&, uint32_t count, IDBGetResult&) override final;
</span><span class="cx">
</span><span class="cx"> void setFirstInRemainingRange(std::set<IDBKeyData>&);
</span><del>- std::set<IDBKeyData>::iterator firstForwardIteratorInRemainingRange(std::set<IDBKeyData>&);
- std::set<IDBKeyData>::reverse_iterator firstReverseIteratorInRemainingRange(std::set<IDBKeyData>&);
</del><ins>+ void setForwardIteratorFromRemainingRange(std::set<IDBKeyData>&);
+ void setReverseIteratorFromRemainingRange(std::set<IDBKeyData>&);
</ins><span class="cx">
</span><span class="cx"> void incrementForwardIterator(std::set<IDBKeyData>&, const IDBKeyData&, uint32_t count);
</span><span class="cx"> void incrementReverseIterator(std::set<IDBKeyData>&, const IDBKeyData&, uint32_t count);
</span><span class="cx">
</span><del>- bool hasIterators() const;
</del><span class="cx"> bool hasValidPosition() const;
</span><del>- void clearIterators();
</del><span class="cx">
</span><span class="cx"> MemoryObjectStore& m_objectStore;
</span><span class="cx">
</span><span class="cx"> IDBKeyRangeData m_remainingRange;
</span><span class="cx">
</span><del>- WTF::Optional<std::set<IDBKeyData>::iterator> m_forwardIterator;
- WTF::Optional<std::set<IDBKeyData>::reverse_iterator> m_reverseIterator;
</del><ins>+ WTF::Optional<std::set<IDBKeyData>::iterator> m_iterator;
</ins><span class="cx">
</span><span class="cx"> IDBKeyData m_currentPositionKey;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>