<!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>[195696] 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/195696">195696</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 14:57:10 -0800 (Wed, 27 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modern IDB: Cursors are utterly broken in the SQLite backend.
https://bugs.webkit.org/show_bug.cgi?id=153558

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (35 failures now pass, others improve).

- Fixes incorrect usage of Index cursors when ObjectStore cursors are intended.
- Improves the state of getting the cursor value vs. reaching the end of a cursor.

* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::openCursor):
(WebCore::IDBServer::SQLiteIDBBackingStore::iterateCursor):

* Modules/indexeddb/server/SQLiteIDBCursor.cpp:
(WebCore::IDBServer::SQLiteIDBCursor::SQLiteIDBCursor):
(WebCore::IDBServer::SQLiteIDBCursor::currentData):
* Modules/indexeddb/server/SQLiteIDBCursor.h:

LayoutTests:

* 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="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195695 => 195696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-27 22:40:52 UTC (rev 195695)
+++ trunk/LayoutTests/ChangeLog        2016-01-27 22:57:10 UTC (rev 195696)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-27  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Cursors are utterly broken in the SQLite backend.
+        https://bugs.webkit.org/show_bug.cgi?id=153558
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-01-27  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Getting / Setting property on prototype object must throw TypeError
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195695 => 195696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-27 22:40:52 UTC (rev 195695)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-27 22:57:10 UTC (rev 195696)
</span><span class="lines">@@ -452,27 +452,15 @@
</span><span class="cx"> imported/w3c/indexeddb/value.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/value_recursive.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/writer-starvation.htm [ Failure ]
</span><del>-storage/indexeddb/closed-cursor.html [ Failure ]
-storage/indexeddb/cursor-added-bug.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-advance.html [ Failure ]
</span><del>-storage/indexeddb/cursor-basics.html [ Failure ]
-storage/indexeddb/cursor-continue-dir.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-continue-validity.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-continue.html [ Failure ]
</span><del>-storage/indexeddb/cursor-delete.html [ Failure ]
-storage/indexeddb/cursor-finished.html [ Failure ]
-storage/indexeddb/cursor-inconsistency.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-index-delete.html [ Failure ]
</span><del>-storage/indexeddb/cursor-key-order.html [ Failure ]
-storage/indexeddb/cursor-prev-no-duplicate.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-primary-key-order.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-skip-deleted.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-update.html [ Failure ]
</span><del>-storage/indexeddb/cursor-value.html [ Failure ]
</del><span class="cx"> storage/indexeddb/delete-range.html [ Failure ]
</span><del>-storage/indexeddb/deleted-objects.html [ Failure ]
</del><span class="cx"> storage/indexeddb/duplicates.html [ Failure ]
</span><del>-storage/indexeddb/exceptions.html [ Failure ]
</del><span class="cx"> storage/indexeddb/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-count.html [ Failure ]
</span><span class="lines">@@ -482,21 +470,13 @@
</span><span class="cx"> storage/indexeddb/index-population.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-unique.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-generator.html [ Failure ]
</span><del>-storage/indexeddb/key-sort-order-across-types.html [ Failure ]
-storage/indexeddb/key-sort-order-date.html [ Failure ]
</del><span class="cx"> storage/indexeddb/keypath-arrays.html [ Failure ]
</span><del>-storage/indexeddb/keypath-fetch-key.html [ Failure ]
</del><span class="cx"> storage/indexeddb/keypath-intrinsic-properties.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-population.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-types.html [ Failure ]
</span><del>-storage/indexeddb/modern/cursor-1.html [ Failure ]
-storage/indexeddb/modern/cursor-2.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/cursor-3.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/cursor-4.html [ Failure ]
</span><del>-storage/indexeddb/modern/cursor-5.html [ Failure ]
-storage/indexeddb/modern/cursor-6.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/cursor-7.html [ Failure ]
</span><del>-storage/indexeddb/modern/cursor-8.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/deleteindex-1.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/deleteindex-2.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><span class="lines">@@ -509,31 +489,16 @@
</span><span class="cx"> storage/indexeddb/modern/index-cursor-2.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-cursor-3.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-get-count-basic.html [ Failure ]
</span><del>-storage/indexeddb/modern/objectstore-cursor-advance-failures.html [ Failure ]
-storage/indexeddb/modern/objectstore-cursor-continue-failures.html [ Failure ]
-storage/indexeddb/modern/request-readystate.html [ Failure ]
-storage/indexeddb/mozilla/clear.html [ Failure ]
-storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html [ Failure ]
</del><span class="cx"> storage/indexeddb/mozilla/cursor-mutation.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/cursor-update-updates-indexes.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/cursors.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/indexes.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/object-cursors.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/remove-objectstore.html [ Failure ]
-storage/indexeddb/mutating-cursor.html [ Failure ]
</del><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-basics.html [ Failure ]
</span><del>-storage/indexeddb/objectstore-clear.html [ Failure ]
-storage/indexeddb/objectstore-cursor.html [ Failure ]
-storage/indexeddb/open-cursor.html [ Failure ]
</del><span class="cx"> storage/indexeddb/opencursor-key.html [ Failure ]
</span><span class="cx"> storage/indexeddb/optional-arguments.html [ Failure ]
</span><del>-storage/indexeddb/prefetch-bugfix-108071.html [ Failure ]
-storage/indexeddb/readonly.html [ Failure ]
-storage/indexeddb/transaction-rollback.html [ Failure ]
-storage/indexeddb/value-undefined.html [ Failure ]
-storage/indexeddb/values-odd-types.html [ Failure ]
</del><span class="cx"> 
</span><span class="cx"> # SQLite backend tests that timeout
</span><span class="cx"> crypto/subtle/rsa-indexeddb.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195695 => 195696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-27 22:40:52 UTC (rev 195695)
+++ trunk/Source/WebCore/ChangeLog        2016-01-27 22:57:10 UTC (rev 195696)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-27  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Cursors are utterly broken in the SQLite backend.
+        https://bugs.webkit.org/show_bug.cgi?id=153558
+
+        Reviewed by Alex Christensen.
+
+        No new tests (35 failures now pass, others improve).
+
+        - Fixes incorrect usage of Index cursors when ObjectStore cursors are intended.
+        - Improves the state of getting the cursor value vs. reaching the end of a cursor.
+
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::openCursor):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::iterateCursor):
+
+        * Modules/indexeddb/server/SQLiteIDBCursor.cpp:
+        (WebCore::IDBServer::SQLiteIDBCursor::SQLiteIDBCursor):
+        (WebCore::IDBServer::SQLiteIDBCursor::currentData):
+        * Modules/indexeddb/server/SQLiteIDBCursor.h:
+
</ins><span class="cx"> 2016-01-27  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Getting / Setting property on prototype object must throw TypeError
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195695 => 195696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-01-27 22:40:52 UTC (rev 195695)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-01-27 22:57:10 UTC (rev 195696)
</span><span class="lines">@@ -1406,7 +1406,7 @@
</span><span class="cx"> 
</span><span class="cx">     m_cursors.set(cursor-&gt;identifier(), cursor);
</span><span class="cx"> 
</span><del>-    result = { cursor-&gt;currentKey(), cursor-&gt;currentPrimaryKey(), ThreadSafeDataBuffer::copyVector(cursor-&gt;currentValueBuffer()) };
</del><ins>+    cursor-&gt;currentData(result);
</ins><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1442,7 +1442,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    result = { cursor-&gt;currentKey(), cursor-&gt;currentPrimaryKey(), ThreadSafeDataBuffer::copyVector(cursor-&gt;currentValueBuffer()) };
</del><ins>+    cursor-&gt;currentData(result);
</ins><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp (195695 => 195696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp        2016-01-27 22:40:52 UTC (rev 195695)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp        2016-01-27 22:57:10 UTC (rev 195696)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> 
</span><span class="cx"> #include &quot;IDBCursorInfo.h&quot;
</span><ins>+#include &quot;IDBGetResult.h&quot;
</ins><span class="cx"> #include &quot;IDBSerialization.h&quot;
</span><span class="cx"> #include &quot;Logging.h&quot;
</span><span class="cx"> #include &quot;SQLiteIDBTransaction.h&quot;
</span><span class="lines">@@ -68,7 +69,7 @@
</span><span class="cx">     : m_transaction(&amp;transaction)
</span><span class="cx">     , m_cursorIdentifier(info.identifier())
</span><span class="cx">     , m_objectStoreID(info.objectStoreIdentifier())
</span><del>-    , m_indexID(info.sourceIdentifier())
</del><ins>+    , m_indexID(info.cursorSource() == IndexedDB::CursorSource::Index ? info.sourceIdentifier() : IDBIndexMetadata::InvalidId)
</ins><span class="cx">     , m_cursorDirection(info.cursorDirection())
</span><span class="cx">     , m_keyRange(info.range())
</span><span class="cx"> {
</span><span class="lines">@@ -86,6 +87,17 @@
</span><span class="cx">     ASSERT(m_objectStoreID);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SQLiteIDBCursor::currentData(IDBGetResult&amp; result)
+{
+    if (m_completed) {
+        ASSERT(!m_errored);
+        result = { };
+        return;
+    }
+
+    result = { m_currentKey, m_currentPrimaryKey, ThreadSafeDataBuffer::copyVector(m_currentValueBuffer) };
+}
+
</ins><span class="cx"> static String buildIndexStatement(const IDBKeyRangeData&amp; keyRange, IndexedDB::CursorDirection cursorDirection)
</span><span class="cx"> {
</span><span class="cx">     StringBuilder builder;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h (195695 => 195696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h        2016-01-27 22:40:52 UTC (rev 195695)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h        2016-01-27 22:57:10 UTC (rev 195696)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class IDBCursorInfo;
</span><ins>+class IDBGetResult;
</ins><span class="cx"> 
</span><span class="cx"> namespace IDBServer {
</span><span class="cx"> 
</span><span class="lines">@@ -67,6 +68,8 @@
</span><span class="cx"> 
</span><span class="cx">     void objectStoreRecordsChanged();
</span><span class="cx"> 
</span><ins>+    void currentData(IDBGetResult&amp;);
+
</ins><span class="cx"> private:
</span><span class="cx">     bool establishStatement();
</span><span class="cx">     bool createSQLiteStatement(const String&amp; sql);
</span></span></pre>
</div>
</div>

</body>
</html>