<!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>[209942] trunk/Source/WebCore</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/209942">209942</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 15:03:26 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>More SQLiteIDBCursor refactoring.
https://bugs.webkit.org/show_bug.cgi?id=165956
Reviewed by Tim Horton.
No new tests (No behavior change).
This is a simple patch that encapsulates the current state of the cursor in one structure
which will allow for storing multiple-such states in the future (to support prefetching).
* Modules/indexeddb/server/SQLiteIDBCursor.cpp:
(WebCore::IDBServer::SQLiteIDBCursor::currentData):
(WebCore::IDBServer::SQLiteIDBCursor::resetAndRebindStatement):
(WebCore::IDBServer::SQLiteIDBCursor::advance):
(WebCore::IDBServer::SQLiteIDBCursor::advanceUnique):
(WebCore::IDBServer::SQLiteIDBCursor::markAsErrored):
(WebCore::IDBServer::SQLiteIDBCursor::internalAdvanceOnce):
(WebCore::IDBServer::SQLiteIDBCursor::iterate):
* Modules/indexeddb/server/SQLiteIDBCursor.h:
(WebCore::IDBServer::SQLiteIDBCursor::currentRecordRowID):
(WebCore::IDBServer::SQLiteIDBCursor::currentKey):
(WebCore::IDBServer::SQLiteIDBCursor::currentPrimaryKey):
(WebCore::IDBServer::SQLiteIDBCursor::currentValue):
(WebCore::IDBServer::SQLiteIDBCursor::didComplete):
(WebCore::IDBServer::SQLiteIDBCursor::didError):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209941 => 209942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-16 23:00:48 UTC (rev 209941)
+++ trunk/Source/WebCore/ChangeLog 2016-12-16 23:03:26 UTC (rev 209942)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-12-16 Brady Eidson <beidson@apple.com>
+
+ More SQLiteIDBCursor refactoring.
+ https://bugs.webkit.org/show_bug.cgi?id=165956
+
+ Reviewed by Tim Horton.
+
+ No new tests (No behavior change).
+
+ This is a simple patch that encapsulates the current state of the cursor in one structure
+ which will allow for storing multiple-such states in the future (to support prefetching).
+
+ * Modules/indexeddb/server/SQLiteIDBCursor.cpp:
+ (WebCore::IDBServer::SQLiteIDBCursor::currentData):
+ (WebCore::IDBServer::SQLiteIDBCursor::resetAndRebindStatement):
+ (WebCore::IDBServer::SQLiteIDBCursor::advance):
+ (WebCore::IDBServer::SQLiteIDBCursor::advanceUnique):
+ (WebCore::IDBServer::SQLiteIDBCursor::markAsErrored):
+ (WebCore::IDBServer::SQLiteIDBCursor::internalAdvanceOnce):
+ (WebCore::IDBServer::SQLiteIDBCursor::iterate):
+
+ * Modules/indexeddb/server/SQLiteIDBCursor.h:
+ (WebCore::IDBServer::SQLiteIDBCursor::currentRecordRowID):
+ (WebCore::IDBServer::SQLiteIDBCursor::currentKey):
+ (WebCore::IDBServer::SQLiteIDBCursor::currentPrimaryKey):
+ (WebCore::IDBServer::SQLiteIDBCursor::currentValue):
+ (WebCore::IDBServer::SQLiteIDBCursor::didComplete):
+ (WebCore::IDBServer::SQLiteIDBCursor::didError):
+
</ins><span class="cx"> 2016-12-16 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Follow-up build fix after r209936; also rename MockCDM -> LegacyMockCDM in
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp (209941 => 209942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-12-16 23:00:48 UTC (rev 209941)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-12-16 23:03:26 UTC (rev 209942)
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx">
</span><span class="cx"> void SQLiteIDBCursor::currentData(IDBGetResult& result)
</span><span class="cx"> {
</span><del>- if (m_completed) {
- ASSERT(!m_errored);
</del><ins>+ if (m_currentRecord.completed) {
+ ASSERT(!m_currentRecord.errored);
</ins><span class="cx"> result = { };
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result = { m_currentRecord.key, m_currentRecord.primaryKey, m_currentRecord.value ? *m_currentRecord.value : IDBValue() };
</del><ins>+ result = { m_currentRecord.record.key, m_currentRecord.record.primaryKey, m_currentRecord.record.value ? *m_currentRecord.record.value : IDBValue() };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildIndexStatement(const IDBKeyRangeData& keyRange, IndexedDB::CursorDirection cursorDirection)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> m_statementNeedsReset = false;
</span><span class="cx">
</span><span class="cx"> // If this cursor never fetched any records, we don't need to reset the statement.
</span><del>- if (m_currentRecord.key.isNull())
</del><ins>+ if (m_currentRecord.record.key.isNull())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Otherwise update the lower key or upper key used for the cursor range.
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> // This is so the cursor can pick up where we left off.
</span><span class="cx"> // We might also have to change the statement from closed to open so we don't refetch the current key a second time.
</span><span class="cx"> if (m_cursorDirection == IndexedDB::CursorDirection::Next || m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate) {
</span><del>- m_currentLowerKey = m_currentRecord.key;
</del><ins>+ m_currentLowerKey = m_currentRecord.record.key;
</ins><span class="cx"> if (!m_keyRange.lowerOpen) {
</span><span class="cx"> m_keyRange.lowerOpen = true;
</span><span class="cx"> m_keyRange.lowerKey = m_currentLowerKey;
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> m_statement = nullptr;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- m_currentUpperKey = m_currentRecord.key;
</del><ins>+ m_currentUpperKey = m_currentRecord.record.key;
</ins><span class="cx"> if (!m_keyRange.upperOpen) {
</span><span class="cx"> m_keyRange.upperOpen = true;
</span><span class="cx"> m_keyRange.upperKey = m_currentUpperKey;
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool isUnique = m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate || m_cursorDirection == IndexedDB::CursorDirection::PrevNoDuplicate;
</span><span class="cx">
</span><del>- if (m_completed) {
</del><ins>+ if (m_currentRecord.completed) {
</ins><span class="cx"> LOG_ERROR("Attempt to advance a completed cursor");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_completed)
</del><ins>+ if (m_currentRecord.completed)
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -316,14 +316,14 @@
</span><span class="cx">
</span><span class="cx"> bool SQLiteIDBCursor::advanceUnique()
</span><span class="cx"> {
</span><del>- IDBKeyData currentKey = m_currentRecord.key;
</del><ins>+ IDBKeyData currentKey = m_currentRecord.record.key;
</ins><span class="cx">
</span><del>- while (!m_completed) {
</del><ins>+ while (!m_currentRecord.completed) {
</ins><span class="cx"> if (!advanceOnce())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If the new current key is different from the old current key, we're done.
</span><del>- if (currentKey.compare(m_currentRecord.key))
</del><ins>+ if (currentKey.compare(m_currentRecord.record.key))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -345,9 +345,9 @@
</span><span class="cx">
</span><span class="cx"> void SQLiteIDBCursor::markAsErrored()
</span><span class="cx"> {
</span><del>- m_completed = true;
- m_errored = true;
- m_currentRecordRowID = 0;
</del><ins>+ m_currentRecord.completed = true;
+ m_currentRecord.errored = true;
+ m_currentRecord.rowID = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SQLiteIDBCursor::AdvanceResult SQLiteIDBCursor::internalAdvanceOnce()
</span><span class="lines">@@ -354,17 +354,16 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_transaction->sqliteTransaction());
</span><span class="cx"> ASSERT(m_statement);
</span><del>- ASSERT(!m_completed);
</del><ins>+ ASSERT(!m_currentRecord.completed);
</ins><span class="cx">
</span><del>- m_currentRecord.value = nullptr;
</del><ins>+ m_currentRecord.record.value = nullptr;
</ins><span class="cx">
</span><span class="cx"> int result = m_statement->step();
</span><span class="cx"> if (result == SQLITE_DONE) {
</span><del>- m_completed = true;
-
</del><span class="cx"> // When a cursor reaches its end, that is indicated by having undefined keys/values
</span><span class="cx"> m_currentRecord = { };
</span><del>- m_currentRecordRowID = 0;
</del><ins>+ m_currentRecord.completed = true;
+ m_currentRecord.rowID = 0;
</ins><span class="cx">
</span><span class="cx"> return AdvanceResult::Success;
</span><span class="cx"> }
</span><span class="lines">@@ -375,13 +374,13 @@
</span><span class="cx"> return AdvanceResult::Failure;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_currentRecordRowID = m_statement->getColumnInt64(0);
- ASSERT(m_currentRecordRowID);
</del><ins>+ m_currentRecord.rowID = m_statement->getColumnInt64(0);
+ ASSERT(m_currentRecord.rowID);
</ins><span class="cx">
</span><span class="cx"> Vector<uint8_t> keyData;
</span><span class="cx"> m_statement->getColumnBlobAsVector(1, keyData);
</span><span class="cx">
</span><del>- if (!deserializeIDBKeyData(keyData.data(), keyData.size(), m_currentRecord.key)) {
</del><ins>+ if (!deserializeIDBKeyData(keyData.data(), keyData.size(), m_currentRecord.record.key)) {
</ins><span class="cx"> LOG_ERROR("Unable to deserialize key data from database while advancing cursor");
</span><span class="cx"> markAsErrored();
</span><span class="cx"> return AdvanceResult::Failure;
</span><span class="lines">@@ -391,10 +390,10 @@
</span><span class="cx">
</span><span class="cx"> // The primaryKey of an ObjectStore cursor is the same as its key.
</span><span class="cx"> if (m_indexID == IDBIndexInfo::InvalidId) {
</span><del>- m_currentRecord.primaryKey = m_currentRecord.key;
</del><ins>+ m_currentRecord.record.primaryKey = m_currentRecord.record.key;
</ins><span class="cx">
</span><span class="cx"> Vector<String> blobURLs, blobFilePaths;
</span><del>- auto error = m_transaction->backingStore().getBlobRecordsForObjectStoreRecord(m_currentRecordRowID, blobURLs, blobFilePaths);
</del><ins>+ auto error = m_transaction->backingStore().getBlobRecordsForObjectStoreRecord(m_currentRecord.rowID, blobURLs, blobFilePaths);
</ins><span class="cx"> if (!error.isNull()) {
</span><span class="cx"> LOG_ERROR("Unable to fetch blob records from database while advancing cursor");
</span><span class="cx"> markAsErrored();
</span><span class="lines">@@ -402,9 +401,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_cursorType == IndexedDB::CursorType::KeyAndValue)
</span><del>- m_currentRecord.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::adoptVector(keyData), blobURLs, blobFilePaths);
</del><ins>+ m_currentRecord.record.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::adoptVector(keyData), blobURLs, blobFilePaths);
</ins><span class="cx"> } else {
</span><del>- if (!deserializeIDBKeyData(keyData.data(), keyData.size(), m_currentRecord.primaryKey)) {
</del><ins>+ if (!deserializeIDBKeyData(keyData.data(), keyData.size(), m_currentRecord.record.primaryKey)) {
</ins><span class="cx"> LOG_ERROR("Unable to deserialize value data from database while advancing index cursor");
</span><span class="cx"> markAsErrored();
</span><span class="cx"> return AdvanceResult::Failure;
</span><span class="lines">@@ -424,7 +423,7 @@
</span><span class="cx">
</span><span class="cx"> if (result == SQLITE_ROW) {
</span><span class="cx"> objectStoreStatement.getColumnBlobAsVector(0, keyData);
</span><del>- m_currentRecord.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::adoptVector(keyData));
</del><ins>+ m_currentRecord.record.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::adoptVector(keyData));
</ins><span class="cx"> } else if (result == SQLITE_DONE) {
</span><span class="cx"> // This indicates that the record we're trying to retrieve has been removed from the object store.
</span><span class="cx"> // Skip over it.
</span><span class="lines">@@ -451,15 +450,15 @@
</span><span class="cx"> if (targetKey.isNull() || !result)
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- while (!m_completed) {
</del><ins>+ while (!m_currentRecord.completed) {
</ins><span class="cx"> if (!result)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Search for the next key >= the target if the cursor is a Next cursor, or the next key <= if the cursor is a Previous cursor.
</span><span class="cx"> if (m_cursorDirection == IndexedDB::CursorDirection::Next || m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate) {
</span><del>- if (m_currentRecord.key.compare(targetKey) >= 0)
</del><ins>+ if (m_currentRecord.record.key.compare(targetKey) >= 0)
</ins><span class="cx"> break;
</span><del>- } else if (m_currentRecord.key.compare(targetKey) <= 0)
</del><ins>+ } else if (m_currentRecord.record.key.compare(targetKey) <= 0)
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> result = advance(1);
</span><span class="lines">@@ -466,15 +465,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (targetPrimaryKey.isValid()) {
</span><del>- while (!m_completed && !m_currentRecord.key.compare(targetKey)) {
</del><ins>+ while (!m_currentRecord.completed && !m_currentRecord.record.key.compare(targetKey)) {
</ins><span class="cx"> if (!result)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Search for the next primary key >= the primary target if the cursor is a Next cursor, or the next key <= if the cursor is a Previous cursor.
</span><span class="cx"> if (m_cursorDirection == IndexedDB::CursorDirection::Next || m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate) {
</span><del>- if (m_currentRecord.primaryKey.compare(targetPrimaryKey) >= 0)
</del><ins>+ if (m_currentRecord.record.primaryKey.compare(targetPrimaryKey) >= 0)
</ins><span class="cx"> break;
</span><del>- } else if (m_currentRecord.primaryKey.compare(targetPrimaryKey) <= 0)
</del><ins>+ } else if (m_currentRecord.record.primaryKey.compare(targetPrimaryKey) <= 0)
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> result = advance(1);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h (209941 => 209942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h 2016-12-16 23:00:48 UTC (rev 209941)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h 2016-12-16 23:03:26 UTC (rev 209942)
</span><span class="lines">@@ -60,17 +60,17 @@
</span><span class="cx"> SQLiteIDBTransaction* transaction() const { return m_transaction; }
</span><span class="cx">
</span><span class="cx"> int64_t objectStoreID() const { return m_objectStoreID; }
</span><del>- int64_t currentRecordRowID() const { return m_currentRecordRowID; }
</del><ins>+ int64_t currentRecordRowID() const { return m_currentRecord.rowID; }
</ins><span class="cx">
</span><del>- const IDBKeyData& currentKey() const { return m_currentRecord.key; }
- const IDBKeyData& currentPrimaryKey() const { return m_currentRecord.primaryKey; }
- IDBValue* currentValue() const { return m_currentRecord.value.get(); }
</del><ins>+ const IDBKeyData& currentKey() const { return m_currentRecord.record.key; }
+ const IDBKeyData& currentPrimaryKey() const { return m_currentRecord.record.primaryKey; }
+ IDBValue* currentValue() const { return m_currentRecord.record.value.get(); }
</ins><span class="cx">
</span><span class="cx"> bool advance(uint64_t count);
</span><span class="cx"> bool iterate(const IDBKeyData& targetKey, const IDBKeyData& targetPrimaryKey);
</span><span class="cx">
</span><del>- bool didComplete() const { return m_completed; }
- bool didError() const { return m_errored; }
</del><ins>+ bool didComplete() const { return m_currentRecord.completed; }
+ bool didError() const { return m_currentRecord.errored; }
</ins><span class="cx">
</span><span class="cx"> void objectStoreRecordsChanged();
</span><span class="cx">
</span><span class="lines">@@ -106,17 +106,20 @@
</span><span class="cx"> IDBKeyData m_currentLowerKey;
</span><span class="cx"> IDBKeyData m_currentUpperKey;
</span><span class="cx">
</span><del>- IDBCursorRecord m_currentRecord;
</del><ins>+ struct SQLiteCursorRecord {
+ IDBCursorRecord record;
+ bool completed { false };
+ bool errored { false };
+ int64_t rowID { 0 };
+ };
</ins><span class="cx">
</span><ins>+ SQLiteCursorRecord m_currentRecord;
+
</ins><span class="cx"> std::unique_ptr<SQLiteStatement> m_statement;
</span><span class="cx"> bool m_statementNeedsReset { false };
</span><span class="cx"> int64_t m_boundID { 0 };
</span><span class="cx">
</span><del>- bool m_completed { false };
- bool m_errored { false };
-
</del><span class="cx"> bool m_backingStoreCursor { false };
</span><del>- int64_t m_currentRecordRowID { 0 };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IDBServer
</span></span></pre>
</div>
</div>
</body>
</html>