<!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>[193431] 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/193431">193431</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 11:41:52 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: storage/indexeddb/version-change-exclusive.html fails
https://bugs.webkit.org/show_bug.cgi?id=151870
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/indexeddb/modern/double-open.html
storage/indexeddb/version-change-exclusive.html
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection): Delay handling open operations
while the first is still in progress.
(WebCore::IDBServer::UniqueIDBDatabase::didOpenBackingStore):
* Modules/indexeddb/server/UniqueIDBDatabase.h:
LayoutTests:
* platform/mac-wk1/TestExpectations:
* storage/indexeddb/modern/double-open-expected.txt: Added.
* storage/indexeddb/modern/double-open.html: Added.
* storage/indexeddb/version-change-exclusive-expected.txt:</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="#trunkLayoutTestsstorageindexeddbversionchangeexclusiveexpectedtxt">trunk/LayoutTests/storage/indexeddb/version-change-exclusive-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndoubleopenexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndoubleopenhtml">trunk/LayoutTests/storage/indexeddb/modern/double-open.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193430 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-04 19:23:02 UTC (rev 193430)
+++ trunk/LayoutTests/ChangeLog 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-12-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: storage/indexeddb/version-change-exclusive.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=151870
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+ * storage/indexeddb/modern/double-open-expected.txt: Added.
+ * storage/indexeddb/modern/double-open.html: Added.
+ * storage/indexeddb/version-change-exclusive-expected.txt:
+
+2015-12-04 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: storage/indexeddb/exceptions.html fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151732
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193430 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-04 19:23:02 UTC (rev 193430)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> storage/indexeddb/transaction-abort.html [ Pass ]
</span><span class="cx"> storage/indexeddb/transaction-error.html [ Pass ]
</span><span class="cx"> storage/indexeddb/transaction-event-propagation.html [ Pass ]
</span><ins>+storage/indexeddb/version-change-exclusive.html [ Pass ]
</ins><span class="cx">
</span><span class="cx"> # No workers support in Modern IDB yet
</span><span class="cx"> storage/indexeddb/basics-workers.html
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndoubleopenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt (0 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This test makes sure that quickly opening the same database multiple times is successful without the backend ASSERTing or crashing.
+Second request done
+done
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndoubleopenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/double-open.html (0 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/double-open.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/double-open.html 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+This test makes sure that quickly opening the same database multiple times is successful without the backend ASSERTing or crashing.<br>
+<div id="logger"></div>
+<script>
+
+function log(msg)
+{
+ document.getElementById("logger").innerHTML += msg + "<br>";
+}
+
+function done()
+{
+ log("done");
+ if (testRunner)
+ testRunner.notifyDone();
+}
+
+if (testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+var req1 = indexedDB.open("testDB");
+req1.onerror = function() {
+ log("First request unexpected error");
+ done();
+}
+
+var req2 = indexedDB.open("testDB");
+req2.onsuccess = function() {
+ log("Second request done");
+ done();
+}
+req2.onerror = function() {
+ log("Second request unexpected error");
+ done();
+}
+
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbversionchangeexclusiveexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/version-change-exclusive-expected.txt (193430 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/version-change-exclusive-expected.txt 2015-12-04 19:23:02 UTC (rev 193430)
+++ trunk/LayoutTests/storage/indexeddb/version-change-exclusive-expected.txt 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> PASS Exception was thrown.
</span><span class="cx"> PASS code is DOMException.INVALID_STATE_ERR
</span><span class="cx"> PASS ename is 'InvalidStateError'
</span><del>-Exception message: InvalidStateError: DOM IDBDatabase Exception 11
</del><ins>+Exception message: Failed to execute 'transaction' on 'IDBDatabase': A version change transaction is running.
</ins><span class="cx"> store.put(0, 0)
</span><span class="cx"> in put's onsuccess
</span><span class="cx"> store.put(1, 1)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193430 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-04 19:23:02 UTC (rev 193430)
+++ trunk/Source/WebCore/ChangeLog 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: storage/indexeddb/version-change-exclusive.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=151870
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/double-open.html
+ storage/indexeddb/version-change-exclusive.html
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection): Delay handling open operations
+ while the first is still in progress.
+ (WebCore::IDBServer::UniqueIDBDatabase::didOpenBackingStore):
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+2015-12-04 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: storage/indexeddb/exceptions.html fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151732
</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 (193430 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-04 19:23:02 UTC (rev 193430)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -63,11 +63,16 @@
</span><span class="cx"> auto operation = IDBServerOperation::create(connection, requestData);
</span><span class="cx"> m_pendingOpenDatabaseOperations.append(WTF::move(operation));
</span><span class="cx">
</span><ins>+ // An open operation is already in progress, so this one has to wait.
+ if (m_isOpeningBackingStore)
+ return;
+
</ins><span class="cx"> if (m_databaseInfo) {
</span><span class="cx"> handleOpenDatabaseOperations();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ m_isOpeningBackingStore = true;
</ins><span class="cx"> m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::openBackingStore, m_identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -307,6 +312,9 @@
</span><span class="cx">
</span><span class="cx"> m_databaseInfo = std::make_unique<IDBDatabaseInfo>(info);
</span><span class="cx">
</span><ins>+ ASSERT(m_isOpeningBackingStore);
+ m_isOpeningBackingStore = false;
+
</ins><span class="cx"> handleOpenDatabaseOperations();
</span><span class="cx"> }
</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 (193430 => 193431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-12-04 19:23:02 UTC (rev 193430)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-12-04 19:41:52 UTC (rev 193431)
</span><span class="lines">@@ -181,6 +181,7 @@
</span><span class="cx"> RefPtr<UniqueIDBDatabaseConnection> m_versionChangeDatabaseConnection;
</span><span class="cx"> UniqueIDBDatabaseTransaction* m_versionChangeTransaction { nullptr };
</span><span class="cx">
</span><ins>+ bool m_isOpeningBackingStore { false };
</ins><span class="cx"> std::unique_ptr<IDBBackingStore> m_backingStore;
</span><span class="cx"> std::unique_ptr<IDBDatabaseInfo> m_databaseInfo;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>