<!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>[163728] 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/163728">163728</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 16:00:30 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDB: storage/indexeddb/mozilla/cursors.html fails
<rdar://problem/16017998> and https://bugs.webkit.org/show_bug.cgi?id=128423
Reviewed by Dan Bernstein.
Source/WebCore:
Tested by storage/indexeddb/mozilla/cursors.html (And probably others)
* Modules/indexeddb/IDBTransactionBackendOperations.cpp:
(WebCore::OpenCursorOperation::perform): Distinguish between an error while opening the cursor
and opening a cursor that points to no records.
Source/WebKit2:
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
(WebKit::SQLiteIDBCursor::internalAdvanceOnce): Store the primary key for object store cursors.
(WebKit::SQLiteIDBCursor::iterate): We’re not supposed to check for equality to the target key.
Depending on the direction of the cursor we should check for the next highest or next lowest key.
LayoutTests:
* platform/mac-wk2/TestExpectations: Unskip storage/indexeddb/mozilla/cursors.html.
Revert the change to storage/indexeddb/mozilla/clear.html as it is now clear how a
null cursor might be returned from openCursor:
* storage/indexeddb/mozilla/clear-expected.txt:
* storage/indexeddb/mozilla/resources/clear.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmozillaclearexpectedtxt">trunk/LayoutTests/storage/indexeddb/mozilla/clear-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmozillaresourcesclearjs">trunk/LayoutTests/storage/indexeddb/mozilla/resources/clear.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBCursorcpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/LayoutTests/ChangeLog 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-08 Brady Eidson <beidson@apple.com>
+
+ IDB: storage/indexeddb/mozilla/cursors.html fails
+ <rdar://problem/16017998> and https://bugs.webkit.org/show_bug.cgi?id=128423
+
+ Reviewed by Dan Bernstein.
+
+ * platform/mac-wk2/TestExpectations: Unskip storage/indexeddb/mozilla/cursors.html.
+
+ Revert the change to storage/indexeddb/mozilla/clear.html as it is now clear how a
+ null cursor might be returned from openCursor:
+ * storage/indexeddb/mozilla/clear-expected.txt:
+ * storage/indexeddb/mozilla/resources/clear.js:
+
</ins><span class="cx"> 2014-02-08 Chris J. Shull <chrisjshull@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Find evaluates attributes in a case sensitive manner
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -477,8 +477,8 @@
</span><span class="cx"> storage/indexeddb/mozilla/create-index-with-integer-keys.html [ Pass ]
</span><span class="cx"> storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html [ Pass ]
</span><span class="cx"> storage/indexeddb/mozilla/cursor-mutation.html [ Pass ]
</span><ins>+storage/indexeddb/mozilla/cursors.html [ Pass ]
</ins><span class="cx">
</span><del>-
</del><span class="cx"> ### END OF (5) Features that are not supported in WebKit1, so skipped in mac/TestExpectations then re-enabled here
</span><span class="cx"> ########################################
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmozillaclearexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/mozilla/clear-expected.txt (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/mozilla/clear-expected.txt 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/LayoutTests/storage/indexeddb/mozilla/clear-expected.txt 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx"> transaction.objectStore('foo').clear();
</span><span class="cx"> request = db.transaction('foo').objectStore('foo').openCursor();
</span><span class="cx"> cursor = request.result;
</span><del>-PASS cursor.key is undefined
-PASS cursor.value is undefined
</del><ins>+PASS cursor is null
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmozillaresourcesclearjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/mozilla/resources/clear.js (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/mozilla/resources/clear.js 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/LayoutTests/storage/indexeddb/mozilla/resources/clear.js 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -37,28 +37,9 @@
</span><span class="cx"> request.onerror = unexpectedErrorCallback;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// The version of this test that existed up until revision ~163500 had the following areWeClearYet handler.
-// The intention was apparently to verify that calling openCursor() on an empty object store returned a null cursor.
-/*
</del><span class="cx"> function areWeClearYet()
</span><span class="cx"> {
</span><span class="cx"> cursor = evalAndLog("cursor = request.result;");
</span><span class="cx"> shouldBe("cursor", "null");
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><del>-*/
-
-// The spec's current description of IDBObjectStore.openCursor(), as found here:
-// http://www.w3.org/TR/IndexedDB/#widl-IDBObjectStore-openCursor-IDBRequest-any-range-IDBCursorDirection-direction
-// does not allow for a null cursor to be returned. It states:
-// "...this method creates a cursor. The cursor must implement the IDBCursorWithValue interface."
-// and then gives no allowance for not returning that created cursor.
-// ---
-// So our current reading of the spec is that a cursor must be returned, but it must be pointing to an undefined key/value record.
-function areWeClearYet()
-{
- cursor = evalAndLog("cursor = request.result;");
- shouldBe("cursor.key", "undefined");
- shouldBe("cursor.value", "undefined");
- finishJSTest();
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/Source/WebCore/ChangeLog 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-08 Brady Eidson <beidson@apple.com>
+
+ IDB: storage/indexeddb/mozilla/cursors.html fails
+ <rdar://problem/16017998> and https://bugs.webkit.org/show_bug.cgi?id=128423
+
+ Reviewed by Dan Bernstein.
+
+ Tested by storage/indexeddb/mozilla/cursors.html (And probably others)
+
+ * Modules/indexeddb/IDBTransactionBackendOperations.cpp:
+ (WebCore::OpenCursorOperation::perform): Distinguish between an error while opening the cursor
+ and opening a cursor that points to no records.
+
</ins><span class="cx"> 2014-02-08 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused ChromeClient::layoutUpdated().
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -151,16 +151,15 @@
</span><span class="cx"> LOG(StorageAPI, "OpenCursorOperation");
</span><span class="cx">
</span><span class="cx"> RefPtr<OpenCursorOperation> operation(this);
</span><del>- auto callback = [this, operation, completionCallback](int64_t cursorID, PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> valueBuffer, PassRefPtr<IDBDatabaseError>) {
- // FIXME: When the LevelDB port fails to open a backing store cursor it calls onSuccess(nullptr);
- // This seems nonsensical and might have to change soon, breaking them.
- if (!cursorID)
</del><ins>+ auto callback = [this, operation, completionCallback](int64_t cursorID, PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> valueBuffer, PassRefPtr<IDBDatabaseError> error) {
+ if (error) {
+ m_callbacks->onError(error);
+ } else if (!key) {
+ // If there's no error but also no key, then the cursor had no records.
</ins><span class="cx"> m_callbacks->onSuccess(static_cast<SharedBuffer*>(0));
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> RefPtr<IDBCursorBackend> cursor = IDBCursorBackend::create(cursorID, m_cursorType, m_taskType, *m_transaction, m_objectStoreID);
</span><del>- if (key || primaryKey || valueBuffer)
- cursor->updateCursorData(key.get(), primaryKey.get(), valueBuffer.get());
-
</del><ins>+ cursor->updateCursorData(key.get(), primaryKey.get(), valueBuffer.get());
</ins><span class="cx"> m_callbacks->onSuccess(cursor.release());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-08 Brady Eidson <beidson@apple.com>
+
+ IDB: storage/indexeddb/mozilla/cursors.html fails
+ <rdar://problem/16017998> and https://bugs.webkit.org/show_bug.cgi?id=128423
+
+ Reviewed by Dan Bernstein.
+
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
+ (WebKit::SQLiteIDBCursor::internalAdvanceOnce): Store the primary key for object store cursors.
+ (WebKit::SQLiteIDBCursor::iterate): We’re not supposed to check for equality to the target key.
+ Depending on the direction of the cursor we should check for the next highest or next lowest key.
+
</ins><span class="cx"> 2014-02-08 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp (163727 => 163728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp 2014-02-08 23:31:35 UTC (rev 163727)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp 2014-02-09 00:00:30 UTC (rev 163728)
</span><span class="lines">@@ -337,7 +337,10 @@
</span><span class="cx"> m_statement->getColumnBlobAsVector(2, keyData);
</span><span class="cx"> m_currentValueBuffer = keyData;
</span><span class="cx">
</span><del>- if (m_indexID != IDBIndexMetadata::InvalidId) {
</del><ins>+ // The primaryKey of an ObjectStore cursor is the same as its key.
+ if (m_indexID == IDBIndexMetadata::InvalidId)
+ m_currentPrimaryKey = m_currentKey;
+ else {
</ins><span class="cx"> if (!deserializeIDBKeyData(keyData.data(), keyData.size(), m_currentPrimaryKey)) {
</span><span class="cx"> LOG_ERROR("Unable to deserialize value data from database while advancing index cursor");
</span><span class="cx"> m_completed = true;
</span><span class="lines">@@ -387,10 +390,18 @@
</span><span class="cx"> if (targetKey.isNull || !result)
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- while (!m_completed && m_currentKey.compare(targetKey)) {
- result = advance(1);
</del><ins>+ while (!m_completed) {
</ins><span class="cx"> if (!result)
</span><span class="cx"> return false;
</span><ins>+
+ // 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.
+ if (m_cursorDirection == IndexedDB::CursorDirection::Next || m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate) {
+ if (m_currentKey.compare(targetKey) >= 0)
+ break;
+ } else if (m_currentKey.compare(targetKey) <= 0)
+ break;
+
+ result = advance(1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre>
</div>
</div>
</body>
</html>