<!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>[195765] 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/195765">195765</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 11:20:25 -0800 (Thu, 28 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modern IDB: Index uniqueness broken in the SQLite backend.
https://bugs.webkit.org/show_bug.cgi?id=153596

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Many failing tests now pass, others improve).

* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::createIndex):
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedHasIndexRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedPutIndexKey):
(WebCore::IDBServer::SQLiteIDBBackingStore::updateOneIndexForAddRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::updateIndexesForAddRecord): Deleted.
* Modules/indexeddb/server/SQLiteIDBBackingStore.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="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195764 => 195765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-28 19:17:17 UTC (rev 195764)
+++ trunk/LayoutTests/ChangeLog        2016-01-28 19:20:25 UTC (rev 195765)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-28  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Index uniqueness broken in the SQLite backend.
+        https://bugs.webkit.org/show_bug.cgi?id=153596
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-01-28  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] gardening after r195740. (more to follow)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195764 => 195765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-28 19:17:17 UTC (rev 195764)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-28 19:20:25 UTC (rev 195765)
</span><span class="lines">@@ -458,26 +458,14 @@
</span><span class="cx"> storage/indexeddb/delete-range.html [ Failure ]
</span><span class="cx"> storage/indexeddb/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-duplicate-keypaths.html [ Failure ]
</span><del>-storage/indexeddb/index-multientry.html [ Failure ]
-storage/indexeddb/index-population.html [ Failure ]
-storage/indexeddb/index-unique.html [ Failure ]
</del><span class="cx"> storage/indexeddb/key-generator.html [ Failure ]
</span><del>-storage/indexeddb/lazy-index-population.html [ Failure ]
-storage/indexeddb/lazy-index-types.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/cursor-7.html [ Failure ]
</span><del>-storage/indexeddb/modern/deleteindex-1.html [ Failure ]
-storage/indexeddb/modern/deleteindex-2.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/idbobjectstore-delete-1.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-3.html [ Failure ]
</span><del>-storage/indexeddb/modern/index-4.html [ Failure ]
</del><span class="cx"> storage/indexeddb/mozilla/cursor-mutation.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/cursors.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Failure ]
-storage/indexeddb/mozilla/indexes.html [ Failure ]
</del><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><del>-storage/indexeddb/objectstore-basics.html [ Failure ]
-storage/indexeddb/opencursor-key.html [ Failure ]
</del><span class="cx"> 
</span><span class="cx"> # SQLite backend tests that timeout
</span><span class="cx"> storage/indexeddb/modern/transaction-scheduler-1.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195764 => 195765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-28 19:17:17 UTC (rev 195764)
+++ trunk/Source/WebCore/ChangeLog        2016-01-28 19:20:25 UTC (rev 195765)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-28  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Index uniqueness broken in the SQLite backend.
+        https://bugs.webkit.org/show_bug.cgi?id=153596
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Many failing tests now pass, others improve).
+
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::createIndex):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedHasIndexRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedPutIndexKey):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::updateOneIndexForAddRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::updateIndexesForAddRecord): Deleted.
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.h:
+
</ins><span class="cx"> 2016-01-08  Jer Noble  &lt;jer.noble@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Custom protocol loading through AVFoundation does not support byte-range requests.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195764 => 195765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-01-28 19:17:17 UTC (rev 195764)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp        2016-01-28 19:20:25 UTC (rev 195765)
</span><span class="lines">@@ -711,6 +711,7 @@
</span><span class="cx"> 
</span><span class="cx"> IDBError SQLiteIDBBackingStore::createIndex(const IDBResourceIdentifier&amp; transactionIdentifier, const IDBIndexInfo&amp; info)
</span><span class="cx"> {
</span><ins>+    LOG(IndexedDB, &quot;SQLiteIDBBackingStore::createIndex - ObjectStore %&quot; PRIu64 &quot;, Index %&quot; PRIu64, info.objectStoreIdentifier(), info.identifier());
</ins><span class="cx">     ASSERT(m_sqliteDB);
</span><span class="cx">     ASSERT(m_sqliteDB-&gt;isOpen());
</span><span class="cx"> 
</span><span class="lines">@@ -752,47 +753,16 @@
</span><span class="cx">         return { IDBDatabaseException::UnknownError, ASCIILiteral(&quot;Unable to populate indexes in database&quot;) };
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    JSLockHolder locker(vm());
-
</del><span class="cx">     while (!cursor-&gt;currentKey().isNull()) {
</span><span class="cx">         auto&amp; key = cursor-&gt;currentKey();
</span><del>-        auto&amp; valueBuffer = cursor-&gt;currentValueBuffer();
</del><ins>+        auto valueBuffer = ThreadSafeDataBuffer::copyVector(cursor-&gt;currentValueBuffer());
</ins><span class="cx"> 
</span><del>-        auto value = deserializeIDBValueBuffer(m_globalObject-&gt;globalExec(), Vector&lt;uint8_t&gt;(valueBuffer), true);
-
-        IndexKey indexKey;
-        generateIndexKeyForValue(*m_globalObject-&gt;globalExec(), info, value.jsValue(), indexKey);
-
-        if (!info.multiEntry()) {
-            IDBError error = uncheckedPutIndexRecord(info.objectStoreIdentifier(), info.identifier(), key, indexKey.asOneKey());
-            if (!error.isNull()) {
-                LOG_ERROR(&quot;Unable to put index record for newly created index&quot;);
-                return error;
-            }
</del><ins>+        IDBError error = updateOneIndexForAddRecord(info, key, valueBuffer);
+        if (!error.isNull()) {
+            // FIXME: Remove this newly added index.
+            return error;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        Vector&lt;IDBKeyData&gt; indexKeys = indexKey.multiEntry();
-
-        if (info.unique()) {
-            bool hasRecord;
-            IDBError error;
-            for (auto&amp; indexKey : indexKeys) {
-                error = uncheckedHasIndexRecord(info.identifier(), indexKey, hasRecord);
-                if (hasRecord)
-                    return IDBError(IDBDatabaseException::ConstraintError);
-                if (!error.isNull())
-                    return error;
-            }
-        }
-
-        for (auto&amp; indexKey : indexKeys) {
-            IDBError error = uncheckedPutIndexRecord(info.objectStoreIdentifier(), info.identifier(), key, indexKey);
-            if (!error.isNull()) {
-                LOG_ERROR(&quot;Unable to put index record for newly created index&quot;);
-                return error;
-            }
-        }
-
</del><span class="cx">         if (!cursor-&gt;advance(1)) {
</span><span class="cx">             LOG_ERROR(&quot;Error advancing cursor while indexing existing records for new index.&quot;);
</span><span class="cx">             return { IDBDatabaseException::UnknownError, ASCIILiteral(&quot;Error advancing cursor while indexing existing records for new index&quot;) };
</span><span class="lines">@@ -802,7 +772,7 @@
</span><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-IDBError SQLiteIDBBackingStore::uncheckedHasIndexRecord(int64_t indexID, const IDBKeyData&amp; indexKey, bool&amp; hasRecord)
</del><ins>+IDBError SQLiteIDBBackingStore::uncheckedHasIndexRecord(const IDBIndexInfo&amp; info, const IDBKeyData&amp; indexKey, bool&amp; hasRecord)
</ins><span class="cx"> {
</span><span class="cx">     hasRecord = false;
</span><span class="cx"> 
</span><span class="lines">@@ -812,10 +782,11 @@
</span><span class="cx">         return { IDBDatabaseException::UnknownError, ASCIILiteral(&quot;Unable to serialize IDBKey to check for index record in database&quot;) };
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    SQLiteStatement sql(*m_sqliteDB, ASCIILiteral(&quot;SELECT rowid FROM IndexRecords WHERE indexID = ? AND key = CAST(? AS TEXT);&quot;));
</del><ins>+    SQLiteStatement sql(*m_sqliteDB, ASCIILiteral(&quot;SELECT rowid FROM IndexRecords WHERE indexID = ? AND objectStoreID = ? AND key = CAST(? AS TEXT);&quot;));
</ins><span class="cx">     if (sql.prepare() != SQLITE_OK
</span><del>-        || sql.bindInt64(1, indexID) != SQLITE_OK
-        || sql.bindBlob(2, indexKeyBuffer-&gt;data(), indexKeyBuffer-&gt;size()) != SQLITE_OK) {
</del><ins>+        || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+        || sql.bindInt64(2, info.objectStoreIdentifier()) != SQLITE_OK
+        || sql.bindBlob(3, indexKeyBuffer-&gt;data(), indexKeyBuffer-&gt;size()) != SQLITE_OK) {
</ins><span class="cx">         LOG_ERROR(&quot;Error checking for index record in database&quot;);
</span><span class="cx">         return { IDBDatabaseException::UnknownError, ASCIILiteral(&quot;Error checking for index record in database&quot;) };
</span><span class="cx">     }
</span><span class="lines">@@ -836,21 +807,19 @@
</span><span class="cx"> 
</span><span class="cx"> IDBError SQLiteIDBBackingStore::uncheckedPutIndexKey(const IDBIndexInfo&amp; info, const IDBKeyData&amp; key, const IndexKey&amp; indexKey)
</span><span class="cx"> {
</span><del>-    if (!info.multiEntry()) {
-        auto error = uncheckedPutIndexRecord(info.objectStoreIdentifier(), info.identifier(), key, indexKey.asOneKey());
-        if (!error.isNull())
-            LOG_ERROR(&quot;Unable to put index record for newly created index&quot;);
</del><ins>+    LOG(IndexedDB, &quot;SQLiteIDBBackingStore::uncheckedPutIndexKey - (%&quot; PRIu64 &quot;) %s, %s&quot;, info.identifier(), key.loggingString().utf8().data(), indexKey.asOneKey().loggingString().utf8().data());
</ins><span class="cx"> 
</span><del>-        return error;
-    }
</del><ins>+    Vector&lt;IDBKeyData&gt; indexKeys;
+    if (info.multiEntry())
+        indexKeys = indexKey.multiEntry();
+    else
+        indexKeys.append(indexKey.asOneKey());
</ins><span class="cx"> 
</span><del>-    Vector&lt;IDBKeyData&gt; indexKeys = indexKey.multiEntry();
-
</del><span class="cx">     if (info.unique()) {
</span><span class="cx">         bool hasRecord;
</span><span class="cx">         IDBError error;
</span><span class="cx">         for (auto&amp; indexKey : indexKeys) {
</span><del>-            error = uncheckedHasIndexRecord(info.identifier(), indexKey, hasRecord);
</del><ins>+            error = uncheckedHasIndexRecord(info, indexKey, hasRecord);
</ins><span class="cx">             if (!error.isNull())
</span><span class="cx">                 return error;
</span><span class="cx">             if (hasRecord)
</span><span class="lines">@@ -1065,7 +1034,7 @@
</span><span class="cx">     return { IDBDatabaseException::UnknownError, ASCIILiteral(&quot;Currently unable to delete all records in a multi-key range&quot;) };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-IDBError SQLiteIDBBackingStore::updateIndexesForAddRecord(const IDBObjectStoreInfo&amp; info, const IDBKeyData&amp; key, const ThreadSafeDataBuffer&amp; value)
</del><ins>+IDBError SQLiteIDBBackingStore::updateOneIndexForAddRecord(const IDBIndexInfo&amp; info, const IDBKeyData&amp; key, const ThreadSafeDataBuffer&amp; value)
</ins><span class="cx"> {
</span><span class="cx">     JSLockHolder locker(vm());
</span><span class="cx"> 
</span><span class="lines">@@ -1073,6 +1042,23 @@
</span><span class="cx">     if (jsValue.isUndefinedOrNull())
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><ins>+    IndexKey indexKey;
+    generateIndexKeyForValue(*m_globalObject-&gt;globalExec(), info, jsValue, indexKey);
+
+    if (indexKey.isNull())
+        return { };
+
+    return uncheckedPutIndexKey(info, key, indexKey);
+}
+
+IDBError SQLiteIDBBackingStore::updateAllIndexesForAddRecord(const IDBObjectStoreInfo&amp; info, const IDBKeyData&amp; key, const ThreadSafeDataBuffer&amp; value)
+{
+    JSLockHolder locker(vm());
+
+    auto jsValue = deserializeIDBValueDataToJSValue(*globalObject().globalExec(), value);
+    if (jsValue.isUndefinedOrNull())
+        return { };
+
</ins><span class="cx">     IDBError error;
</span><span class="cx">     Vector&lt;std::pair&lt;uint64_t, IndexKey&gt;&gt; changedIndexRecords;
</span><span class="cx"> 
</span><span class="lines">@@ -1130,7 +1116,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto error = updateIndexesForAddRecord(objectStoreInfo, keyData, value);
</del><ins>+    auto error = updateAllIndexesForAddRecord(objectStoreInfo, keyData, value);
</ins><span class="cx"> 
</span><span class="cx">     // FIXME: If there was an error indexing this record, remove it.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h (195764 => 195765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h        2016-01-28 19:17:17 UTC (rev 195764)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h        2016-01-28 19:20:25 UTC (rev 195765)
</span><span class="lines">@@ -88,13 +88,15 @@
</span><span class="cx">     std::unique_ptr&lt;IDBDatabaseInfo&gt; extractExistingDatabaseInfo();
</span><span class="cx"> 
</span><span class="cx">     IDBError deleteRecord(SQLiteIDBTransaction&amp;, int64_t objectStoreID, const IDBKeyData&amp;);
</span><del>-    IDBError uncheckedPutIndexKey(const IDBIndexInfo&amp;, const IDBKeyData&amp; keyValue, const IndexKey&amp;);
-    IDBError uncheckedPutIndexRecord(int64_t objectStoreID, int64_t indexID, const IDBKeyData&amp; keyValue, const IDBKeyData&amp; indexKey);
-    IDBError uncheckedHasIndexRecord(int64_t indexID, const IDBKeyData&amp;, bool&amp; hasRecord);
</del><span class="cx">     IDBError uncheckedGetKeyGeneratorValue(int64_t objectStoreID, uint64_t&amp; outValue);
</span><span class="cx">     IDBError uncheckedSetKeyGeneratorValue(int64_t objectStoreID, uint64_t value);
</span><del>-    IDBError updateIndexesForAddRecord(const IDBObjectStoreInfo&amp;, const IDBKeyData&amp;, const ThreadSafeDataBuffer&amp; value);
</del><span class="cx"> 
</span><ins>+    IDBError updateAllIndexesForAddRecord(const IDBObjectStoreInfo&amp;, const IDBKeyData&amp;, const ThreadSafeDataBuffer&amp; value);
+    IDBError updateOneIndexForAddRecord(const IDBIndexInfo&amp;, const IDBKeyData&amp;, const ThreadSafeDataBuffer&amp; value);
+    IDBError uncheckedPutIndexKey(const IDBIndexInfo&amp;, const IDBKeyData&amp; keyValue, const IndexKey&amp;);
+    IDBError uncheckedPutIndexRecord(int64_t objectStoreID, int64_t indexID, const IDBKeyData&amp; keyValue, const IDBKeyData&amp; indexKey);
+    IDBError uncheckedHasIndexRecord(const IDBIndexInfo&amp;, const IDBKeyData&amp;, bool&amp; hasRecord);
+
</ins><span class="cx">     JSC::VM&amp; vm();
</span><span class="cx">     JSC::JSGlobalObject&amp; globalObject();
</span><span class="cx">     void initializeVM();
</span></span></pre>
</div>
</div>

</body>
</html>