<!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>[195499] 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/195499">195499</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-22 17:48:39 -0800 (Fri, 22 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modern IDB: Disable simultaneous transactions in the SQLite backend for now.
https://bugs.webkit.org/show_bug.cgi?id=153381

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (This resolves many of the currently crashing/asserting tests).

Right now we're porting the Legacy IDB SQLite backend to Modern IDB.

The way the Legacy backend works is restricted to one transaction at a time.

There's many tricks we can play to resolve this, but that task is better performed
once all of the basic functionality is done.

Fixing this limitation is covered by https://bugs.webkit.org/show_bug.cgi?id=153382

* Modules/indexeddb/server/IDBBackingStore.h: Add a &quot;supports simultaneous transactions&quot; getter.
* Modules/indexeddb/server/MemoryIDBBackingStore.h:
* Modules/indexeddb/server/SQLiteIDBBackingStore.h:

* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::deleteBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::openBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction): If the backing store does
  not support simultaneous transactions but there is a transaction in progress, return.
* Modules/indexeddb/server/UniqueIDBDatabase.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="#trunkSourceWebCoreModulesindexeddbserverIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/LayoutTests/ChangeLog        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-22  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Disable simultaneous transactions in the SQLite backend for now.
+        https://bugs.webkit.org/show_bug.cgi?id=153381
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-01-22  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         document.charset should be an alias for document.characterSet
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -254,6 +254,9 @@
</span><span class="cx"> imported/w3c/indexeddb/cursor-overloads.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-direction-index-keyrange.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-direction-index.htm [ Failure ]
</span><ins>+imported/w3c/indexeddb/idbcursor-direction-objectstore-keyrange.htm [ Failure ]
+imported/w3c/indexeddb/idbcursor-direction-objectstore.htm [ Failure ]
+imported/w3c/indexeddb/idbcursor-direction.htm [ Failure ]
</ins><span class="cx"> imported/w3c/indexeddb/idbcursor-key.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-primarykey.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-reused.htm [ Failure ]
</span><span class="lines">@@ -435,6 +438,7 @@
</span><span class="cx"> imported/w3c/indexeddb/transaction_bubble-and-capture.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/value.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/value_recursive.htm [ Failure ]
</span><ins>+imported/w3c/indexeddb/writer-starvation.htm [ Failure ]
</ins><span class="cx"> storage/indexeddb/createIndex-after-failure.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-added-bug.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-advance.html [ Failure ]
</span><span class="lines">@@ -558,6 +562,7 @@
</span><span class="cx"> storage/indexeddb/transaction-and-objectstore-calls.html [ Failure ]
</span><span class="cx"> storage/indexeddb/transaction-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/transaction-error.html [ Failure ]
</span><ins>+storage/indexeddb/transaction-read-only.html [ Failure ]
</ins><span class="cx"> storage/indexeddb/transaction-rollback.html [ Failure ]
</span><span class="cx"> storage/indexeddb/value-undefined.html [ Failure ]
</span><span class="cx"> storage/indexeddb/values-odd-types.html [ Failure ]
</span><span class="lines">@@ -573,36 +578,28 @@
</span><span class="cx"> imported/w3c/indexeddb/idbindex-multientry-big.htm [ Skip ]
</span><span class="cx"> imported/w3c/indexeddb/idbobjectstore_openCursor_invalid.htm [ Skip ]
</span><span class="cx"> imported/w3c/indexeddb/keypath.htm [ Skip ]
</span><ins>+storage/indexeddb/closed-cursor.html [ Skip ]
+storage/indexeddb/cursor-cast.html [ Skip ]
</ins><span class="cx"> storage/indexeddb/deletedatabase-transaction.html [ Skip ]
</span><span class="cx"> storage/indexeddb/modern/blocked-open-db-requests.html [ Skip ]
</span><ins>+storage/indexeddb/modern/transaction-scheduler-1.html [ Skip ]
+storage/indexeddb/modern/transaction-scheduler-2.html [ Skip ]
</ins><span class="cx"> storage/indexeddb/modern/transaction-scheduler-4.html [ Skip ]
</span><del>-storage/indexeddb/prefetch-invalidation.html [ Skip ]
-storage/indexeddb/primary-key-unique-to-objectstore.html [ Skip ]
-storage/indexeddb/transaction-ordering.html [ Skip ]
-storage/indexeddb/closed-cursor.html [ Skip ]
-storage/indexeddb/cursor-cast.html [ Skip ]
</del><ins>+storage/indexeddb/modern/transaction-scheduler-5.html [ Skip ]
+storage/indexeddb/modern/transaction-scheduler-6.html [ Skip ]
</ins><span class="cx"> storage/indexeddb/noblobs.html [ Skip ]
</span><ins>+storage/indexeddb/pending-activity.html [ Skip ]
+storage/indexeddb/prefetch-invalidation.html [ Skip ]
</ins><span class="cx"> storage/indexeddb/prefetch-race.html [ Skip ]
</span><ins>+storage/indexeddb/primary-key-unique-to-objectstore.html [ Skip ]
</ins><span class="cx"> storage/indexeddb/request-result-cache.html [ Skip ]
</span><ins>+storage/indexeddb/transaction-coordination-within-database.html [ Skip ]
+storage/indexeddb/transaction-ordering.html [ Skip ]
</ins><span class="cx"> 
</span><del>-# SQLite backend tests that ASSERT
-imported/w3c/indexeddb/idbcursor-direction-objectstore-keyrange.htm [ Skip ]
-imported/w3c/indexeddb/idbcursor-direction-objectstore.htm [ Skip ]
-imported/w3c/indexeddb/idbcursor-direction.htm [ Skip ]
-imported/w3c/indexeddb/key_valid.html [ Skip ]
-imported/w3c/indexeddb/writer-starvation.htm [ Skip ]
-storage/indexeddb/database-close.html [ Skip ]
</del><ins>+# SQLite backend tests that crash or ASSERT
</ins><span class="cx"> storage/indexeddb/database-odd-names.html [ Skip ]
</span><span class="cx"> storage/indexeddb/dont-wedge.html [ Skip ]
</span><del>-storage/indexeddb/modern/transaction-scheduler-1.html [ Skip ]
-storage/indexeddb/modern/transaction-scheduler-2.html [ Skip ]
-storage/indexeddb/modern/transaction-scheduler-5.html [ Skip ]
-storage/indexeddb/modern/transaction-scheduler-6.html [ Skip ]
</del><span class="cx"> storage/indexeddb/odd-strings.html [ Skip ]
</span><del>-storage/indexeddb/pending-activity.html [ Skip ]
-storage/indexeddb/transaction-coordination-within-database.html [ Skip ]
-storage/indexeddb/transaction-overlapping.html [ Skip ]
-storage/indexeddb/transaction-read-only.html [ Skip ]
</del><span class="cx"> 
</span><span class="cx"> # SQLite backend tests that wedge the entire testing harness
</span><span class="cx"> imported/w3c/indexeddb/keyorder.htm [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/Source/WebCore/ChangeLog        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-01-22  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        Modern IDB: Disable simultaneous transactions in the SQLite backend for now.
+        https://bugs.webkit.org/show_bug.cgi?id=153381
+
+        Reviewed by Alex Christensen.
+
+        No new tests (This resolves many of the currently crashing/asserting tests).
+
+        Right now we're porting the Legacy IDB SQLite backend to Modern IDB.
+        
+        The way the Legacy backend works is restricted to one transaction at a time.
+        
+        There's many tricks we can play to resolve this, but that task is better performed
+        once all of the basic functionality is done.
+        
+        Fixing this limitation is covered by https://bugs.webkit.org/show_bug.cgi?id=153382
+
+        * Modules/indexeddb/server/IDBBackingStore.h: Add a &quot;supports simultaneous transactions&quot; getter.
+        * Modules/indexeddb/server/MemoryIDBBackingStore.h:
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.h:
+        
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::deleteBackingStore):
+        (WebCore::IDBServer::UniqueIDBDatabase::openBackingStore):
+        (WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
+        (WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction): If the backing store does
+          not support simultaneous transactions but there is a transaction in progress, return.
+        * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
</ins><span class="cx"> 2016-01-22  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         document.charset should be an alias for document.characterSet
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBBackingStore.h        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx">     virtual IDBError iterateCursor(const IDBResourceIdentifier&amp; transactionIdentifier, const IDBResourceIdentifier&amp; cursorIdentifier, const IDBKeyData&amp;, uint32_t count, IDBGetResult&amp; outResult) = 0;
</span><span class="cx"> 
</span><span class="cx">     virtual void deleteBackingStore() = 0;
</span><ins>+    virtual bool supportsSimultaneousTransactions() = 0;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace IDBServer
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">     virtual IDBError iterateCursor(const IDBResourceIdentifier&amp; transactionIdentifier, const IDBResourceIdentifier&amp; cursorIdentifier, const IDBKeyData&amp;, uint32_t count, IDBGetResult&amp; outResult) override final;
</span><span class="cx"> 
</span><span class="cx">     virtual void deleteBackingStore() override final;
</span><ins>+    virtual bool supportsSimultaneousTransactions() override final { return true; }
</ins><span class="cx"> 
</span><span class="cx">     void removeObjectStoreForVersionChangeAbort(MemoryObjectStore&amp;);
</span><span class="cx">     void restoreObjectStoreForVersionChangeAbort(Ref&lt;MemoryObjectStore&gt;&amp;&amp;);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx">     virtual IDBError iterateCursor(const IDBResourceIdentifier&amp; transactionIdentifier, const IDBResourceIdentifier&amp; cursorIdentifier, const IDBKeyData&amp;, uint32_t count, IDBGetResult&amp; outResult) override final;
</span><span class="cx"> 
</span><span class="cx">     virtual void deleteBackingStore() override final;
</span><ins>+    virtual bool supportsSimultaneousTransactions() override final { return false; }
</ins><span class="cx"> 
</span><span class="cx">     void unregisterCursor(SQLiteIDBCursor&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -209,6 +209,7 @@
</span><span class="cx">     if (m_backingStore) {
</span><span class="cx">         m_backingStore-&gt;deleteBackingStore();
</span><span class="cx">         m_backingStore = nullptr;
</span><ins>+        m_backingStoreSupportsSimultaneousTransactions = false;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &amp;UniqueIDBDatabase::didDeleteBackingStore));
</span><span class="lines">@@ -446,6 +447,7 @@
</span><span class="cx"> 
</span><span class="cx">     ASSERT(!m_backingStore);
</span><span class="cx">     m_backingStore = m_server.createBackingStore(identifier);
</span><ins>+    m_backingStoreSupportsSimultaneousTransactions = m_backingStore-&gt;supportsSimultaneousTransactions();
</ins><span class="cx">     auto databaseInfo = m_backingStore-&gt;getOrEstablishDatabaseInfo();
</span><span class="cx"> 
</span><span class="cx">     m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &amp;UniqueIDBDatabase::didOpenBackingStore, databaseInfo));
</span><span class="lines">@@ -1088,7 +1090,7 @@
</span><span class="cx"> 
</span><span class="cx"> void UniqueIDBDatabase::enqueueTransaction(Ref&lt;UniqueIDBDatabaseTransaction&gt;&amp;&amp; transaction)
</span><span class="cx"> {
</span><del>-    LOG(IndexedDB, &quot;UniqueIDBDatabase::enqueueTransaction&quot;);
</del><ins>+    LOG(IndexedDB, &quot;UniqueIDBDatabase::enqueueTransaction - %s&quot;, transaction-&gt;info().loggingString().utf8().data());
</ins><span class="cx"> 
</span><span class="cx">     ASSERT(transaction-&gt;info().mode() != IndexedDB::TransactionMode::VersionChange);
</span><span class="cx"> 
</span><span class="lines">@@ -1183,6 +1185,12 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr&lt;UniqueIDBDatabaseTransaction&gt; UniqueIDBDatabase::takeNextRunnableTransaction(bool&amp; hadDeferredTransactions)
</span><span class="cx"> {
</span><ins>+    hadDeferredTransactions = false;
+    if (!m_backingStoreSupportsSimultaneousTransactions &amp;&amp; !m_inProgressTransactions.isEmpty()) {
+        LOG(IndexedDB, &quot;UniqueIDBDatabase::takeNextRunnableTransaction - Backing store only supports 1 transaction, and we already have 1&quot;);
+        return nullptr;
+    }
+
</ins><span class="cx">     Deque&lt;RefPtr&lt;UniqueIDBDatabaseTransaction&gt;&gt; deferredTransactions;
</span><span class="cx">     RefPtr&lt;UniqueIDBDatabaseTransaction&gt; currentTransaction;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (195498 => 195499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h        2016-01-23 01:32:02 UTC (rev 195498)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h        2016-01-23 01:48:39 UTC (rev 195499)
</span><span class="lines">@@ -195,6 +195,8 @@
</span><span class="cx">     std::unique_ptr&lt;IDBDatabaseInfo&gt; m_databaseInfo;
</span><span class="cx">     std::unique_ptr&lt;IDBDatabaseInfo&gt; m_mostRecentDeletedDatabaseInfo;
</span><span class="cx"> 
</span><ins>+    bool m_backingStoreSupportsSimultaneousTransactions { false };
+
</ins><span class="cx">     HashMap&lt;uint64_t, ErrorCallback&gt; m_errorCallbacks;
</span><span class="cx">     HashMap&lt;uint64_t, KeyDataCallback&gt; m_keyDataCallbacks;
</span><span class="cx">     HashMap&lt;uint64_t, GetResultCallback&gt; m_getResultCallbacks;
</span></span></pre>
</div>
</div>

</body>
</html>