<!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>[163245] trunk/Source</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/163245">163245</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-01 11:04:02 -0800 (Sat, 01 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDB: Index cursor complete advance() and iterate() support
<rdar://problem/15941916> and https://bugs.webkit.org/show_bug.cgi?id=127870
Reviewed by Dan Bernstein.
Source/WebCore:
* Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::onSuccess): Always use the value buffer for the script object.
Source/WebKit2:
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
(WebKit::SQLiteIDBCursor::advanceOnce): Look up the found record value from the
object store records based on the key we found from the index.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163244 => 163245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-01 18:14:17 UTC (rev 163244)
+++ trunk/Source/WebCore/ChangeLog 2014-02-01 19:04:02 UTC (rev 163245)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-01 Brady Eidson <beidson@apple.com>
+
+ IDB: Index cursor complete advance() and iterate() support
+ <rdar://problem/15941916> and https://bugs.webkit.org/show_bug.cgi?id=127870
+
+ Reviewed by Dan Bernstein.
+
+ * Modules/indexeddb/IDBRequest.cpp:
+ (WebCore::IDBRequest::onSuccess): Always use the value buffer for the script object.
+
</ins><span class="cx"> 2014-02-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Update WebCrypto JWK mapping to use key_ops
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (163244 => 163245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2014-02-01 18:14:17 UTC (rev 163244)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2014-02-01 19:04:02 UTC (rev 163245)
</span><span class="lines">@@ -287,13 +287,8 @@
</span><span class="cx"> RefPtr<IDBKey> key = backend->key();
</span><span class="cx"> RefPtr<IDBKey> primaryKey = backend->primaryKey();
</span><span class="cx">
</span><del>- Deprecated::ScriptValue value;
</del><ins>+ Deprecated::ScriptValue value = deserializeIDBValueBuffer(requestState(), backend->valueBuffer());
</ins><span class="cx">
</span><del>- if (backend->valueKey())
- value = idbKeyToScriptValue(requestState(), backend->valueKey());
- else
- value = deserializeIDBValueBuffer(requestState(), backend->valueBuffer());
-
</del><span class="cx"> ASSERT(!m_pendingCursor);
</span><span class="cx"> RefPtr<IDBCursor> cursor;
</span><span class="cx"> switch (m_cursorType) {
</span><span class="lines">@@ -409,7 +404,7 @@
</span><span class="cx"> onSuccess(key, primaryKey, buffer, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBRequest::onSuccess(PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> buffer, PassRefPtr<IDBKey> valueKey)
</del><ins>+void IDBRequest::onSuccess(PassRefPtr<IDBKey> key, PassRefPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> buffer, PassRefPtr<IDBKey>)
</ins><span class="cx"> {
</span><span class="cx"> LOG(StorageAPI, "IDBRequest::onSuccess(key, primaryKey, valueBuffer, valueKey)");
</span><span class="cx"> if (!shouldEnqueueEvent())
</span><span class="lines">@@ -417,11 +412,7 @@
</span><span class="cx">
</span><span class="cx"> DOMRequestState::Scope scope(m_requestState);
</span><span class="cx">
</span><del>- Deprecated::ScriptValue value;
- if (valueKey)
- value = idbKeyToScriptValue(requestState(), valueKey);
- else
- value = deserializeIDBValueBuffer(requestState(), buffer);
</del><ins>+ Deprecated::ScriptValue value = deserializeIDBValueBuffer(requestState(), buffer);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_pendingCursor);
</span><span class="cx"> setResultCursor(m_pendingCursor.release(), key, primaryKey, value);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163244 => 163245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-01 18:14:17 UTC (rev 163244)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-01 19:04:02 UTC (rev 163245)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-01 Brady Eidson <beidson@apple.com>
+
+ IDB: Index cursor complete advance() and iterate() support
+ <rdar://problem/15941916> and https://bugs.webkit.org/show_bug.cgi?id=127870
+
+ Reviewed by Dan Bernstein.
+
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
+ (WebKit::SQLiteIDBCursor::advanceOnce): Look up the found record value from the
+ object store records based on the key we found from the index.
+
</ins><span class="cx"> 2014-01-31 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add webView:didFailNavigation:withError: delegate method
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp (163244 => 163245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp 2014-02-01 18:14:17 UTC (rev 163244)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp 2014-02-01 19:04:02 UTC (rev 163245)
</span><span class="lines">@@ -283,13 +283,22 @@
</span><span class="cx">
</span><span class="cx"> if (m_indexID != IDBIndexMetadata::InvalidId) {
</span><span class="cx"> if (!deserializeIDBKeyData(reinterpret_cast<const uint8_t*>(keyData.data()), keyData.size(), m_currentValueKey)) {
</span><del>- LOG_ERROR("Unable to deserialize value data from database while advancing cursor");
</del><ins>+ LOG_ERROR("Unable to deserialize value data from database while advancing index cursor");
</ins><span class="cx"> m_completed = true;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Index cursors should only have a m_currentValueKey, and not m_currentValueBuffer
- m_currentValueBuffer.clear();
</del><ins>+ SQLiteStatement objectStoreStatement(*m_statement->database(), "SELECT value FROM Records WHERE key = CAST(? AS TEXT) and objectStoreID = ?;");
+
+ if (objectStoreStatement.prepare() != SQLResultOk
+ || objectStoreStatement.bindBlob(1, m_currentValueBuffer.data(), m_currentValueBuffer.size()) != SQLResultOk
+ || objectStoreStatement.bindInt64(2, m_objectStoreID) != SQLResultOk
+ || objectStoreStatement.step() != SQLResultRow) {
+ LOG_ERROR("Could not create index cursor statement into object store records");
+ return false;
+ }
+
+ objectStoreStatement.getColumnBlobAsVector(0, m_currentValueBuffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>