<!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>[192687] 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/192687">192687</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-20 10:55:42 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: IDBFactory.deleteDatabase() support.
https://bugs.webkit.org/show_bug.cgi?id=151456
Reviewed by Alex Christensen.
Source/WebCore:
Tests: storage/indexeddb/modern/deletedatabase-1.html
storage/indexeddb/modern/deletedatabase-2.html
* Modules/indexeddb/client/IDBDatabaseImpl.cpp:
(WebCore::IDBClient::IDBDatabase::hasPendingActivity):
(WebCore::IDBClient::IDBDatabase::didCommitOrAbortTransaction):
* Modules/indexeddb/client/IDBDatabaseImpl.h:
* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::onDeleteDatabaseSuccess):
(WebCore::IDBClient::IDBOpenDBRequest::requestCompleted):
* Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::hasPendingActivity): Deleted.
* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::deleteDatabase):
(WebCore::IDBServer::IDBServer::deleteUniqueIDBDatabase):
* Modules/indexeddb/server/IDBServer.h:
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::hasAnyPendingCallbacks):
(WebCore::IDBServer::UniqueIDBDatabase::maybeDeleteDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations):
(WebCore::IDBServer::UniqueIDBDatabase::handleDelete):
(WebCore::IDBServer::UniqueIDBDatabase::notifyConnectionsOfVersionChangeForUpgrade):
(WebCore::IDBServer::UniqueIDBDatabase::notifyConnectionsOfVersionChange):
(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
(WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::invokeDeleteOrRunTransactionTimer):
(WebCore::IDBServer::UniqueIDBDatabase::deleteOrRunTransactionsTimerFired):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformActivateTransactionInBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::inProgressTransactionCompleted):
(WebCore::IDBServer::UniqueIDBDatabase::invokeTransactionScheduler): Deleted.
(WebCore::IDBServer::UniqueIDBDatabase::transactionSchedulingTimerFired): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:
(WebCore::IDBServer::UniqueIDBDatabase::identifier):
(WebCore::IDBServer::UniqueIDBDatabase::deletePending):
* Modules/indexeddb/shared/IDBResultData.cpp:
(WebCore::IDBResultData::deleteDatabaseSuccess):
* Modules/indexeddb/shared/IDBResultData.h:
LayoutTests:
* storage/indexeddb/modern/deletedatabase-1-expected.txt: Added.
* storage/indexeddb/modern/deletedatabase-1.html: Added.
* storage/indexeddb/modern/deletedatabase-2-expected.txt: Added.
* storage/indexeddb/modern/deletedatabase-2.html: Added.
* storage/indexeddb/modern/deletedatabase-request-event-expected.txt:
* storage/indexeddb/modern/deletedatabase-request-event.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventhtml">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServerh">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.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>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResultDatacpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResultDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/LayoutTests/ChangeLog 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-11-20 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: IDBFactory.deleteDatabase() support.
+ https://bugs.webkit.org/show_bug.cgi?id=151456
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/deletedatabase-1-expected.txt: Added.
+ * storage/indexeddb/modern/deletedatabase-1.html: Added.
+ * storage/indexeddb/modern/deletedatabase-2-expected.txt: Added.
+ * storage/indexeddb/modern/deletedatabase-2.html: Added.
+ * storage/indexeddb/modern/deletedatabase-request-event-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-request-event.html:
+
+2015-11-20 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Get IDBRequest.readyState right.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151484
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt (0 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.
+Initial upgrade old version - 0 new version - 1
+Version change complete
+Requesting deleteDatabase
+First connection received versionchange event: oldVersion 1, newVersion 0
+Delete database success: oldVersion 1, newVersion 0
+Recreating database to make sure it's new and empty
+Second upgrade old version - 0 new version - 1
+Unable to get object store in second upgrade transaction (which is correct because it should not be there)
+Second database upgrade success
+Done
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html (0 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -0,0 +1,134 @@
</span><ins>+This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.<br>
+<div id="logger"></div>
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ log("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function log(message)
+{
+ document.getElementById("logger").innerHTML += message + "<br>";
+}
+
+var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
+request.onsuccess = function()
+{
+ log("Unexpected success");
+ done();
+}
+request.onerror = function(e)
+{
+ log("Unexpected error");
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ log("Initial upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+
+ var versionTransaction = request.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("This is a record", 1);
+
+ request.transaction.oncomplete = function()
+ {
+ log("Version change complete");
+ var connection = request.transaction.db;
+ connection.onversionchange = function(e)
+ {
+ log("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+ connection.close();
+ }
+ continueTest1();
+ }
+ request.transaction.onabort = function()
+ {
+ log("Version change unexpected abort");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ log("Version change unexpected error");
+ done();
+ }
+}
+
+function continueTest1()
+{
+ log("Requesting deleteDatabase");
+ var request = window.indexedDB.deleteDatabase("DeleteDatabase1TestDatabase");
+ request.onsuccess = function(e)
+ {
+ log("Delete database success: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+ continueTest2();
+ }
+ request.onerror = function(e)
+ {
+ log("Delete database unexpected error");
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ log("Delete database unexpected upgradeneeded");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ log("Recreating database to make sure it's new and empty");
+ var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
+
+ request.onupgradeneeded = function(e)
+ {
+ log("Second upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+ var versionTransaction = request.transaction;
+
+ try {
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ } catch(e) {
+ log("Unable to get object store in second upgrade transaction (which is correct because it should not be there)");
+ }
+
+ versionTransaction.oncomplete = function(e)
+ {
+ log("Second database upgrade success");
+ done();
+ }
+
+ versionTransaction.onabort = function(e)
+ {
+ log("Second database upgrade unexpected abort");
+ done();
+ }
+
+ versionTransaction.onerror = function(e)
+ {
+ log("Second database upgrade unexpected error");
+ done();
+ }
+ }
+
+ request.onsuccess = function(e)
+ {
+ log("Second database opening unexpected success");
+ done();
+ }
+
+ request.onerror = function(e)
+ {
+ log("Second database opening unexpected error");
+ done();
+ }
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt (0 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.
+That open connection also has an in-progress transaction at the time it gets the versionChange event.
+Initial upgrade old version - 0 new version - 1
+Requesting deleteDatabase
+First connection received versionchange event: oldVersion 0, newVersion 0
+First version change complete
+Delete database success: oldVersion 1, newVersion 0
+Recreating database to make sure it's new and empty
+Second upgrade old version - 0 new version - 1
+Unable to get object store in second upgrade transaction (which is correct because it should not be there)
+Second database upgrade success
+Done
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html (0 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -0,0 +1,151 @@
</span><ins>+This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.<br>
+That open connection also has an in-progress transaction at the time it gets the versionChange event.<br>
+<div id="logger"></div>
+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ log("Done");
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+function log(message)
+{
+ document.getElementById("logger").innerHTML += message + "<br>";
+}
+
+var stopSpinning = false;
+
+var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
+request.onsuccess = function()
+{
+ log("Unexpected success");
+ done();
+}
+request.onerror = function(e)
+{
+ log("Unexpected error");
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ log("Initial upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+
+ var versionTransaction = request.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("This is a record", 1);
+
+ // Spin the transaction until told to stop spinning it.
+ var keepGoing = function() {
+ if (!stopSpinning)
+ objectStore.get(1).onsuccess = keepGoing;
+ }
+ objectStore.get(1).onsuccess = keepGoing;
+
+ database.onversionchange = function(e)
+ {
+ log("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+
+ var shutErDown = function() {
+ database.close();
+ stopSpinning = true;
+ }
+ window.setTimeout(shutErDown, 0);
+ }
+
+ request.transaction.oncomplete = function()
+ {
+ log("First version change complete");
+ }
+
+ request.transaction.onabort = function()
+ {
+ log("Version change unexpected abort");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ log("Version change unexpected error");
+ done();
+ }
+
+ window.setTimeout(continueTest1, 0);
+}
+
+function continueTest1()
+{
+ log("Requesting deleteDatabase");
+ var request = window.indexedDB.deleteDatabase("DeleteDatabase2TestDatabase");
+ request.onsuccess = function(e)
+ {
+ log("Delete database success: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+ continueTest2();
+ }
+ request.onerror = function(e)
+ {
+ log("Delete database unexpected error");
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ log("Delete database unexpected upgradeneeded");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ log("Recreating database to make sure it's new and empty");
+ var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
+
+ request.onupgradeneeded = function(e)
+ {
+ log("Second upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+ var versionTransaction = request.transaction;
+
+ try {
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ } catch(e) {
+ log("Unable to get object store in second upgrade transaction (which is correct because it should not be there)");
+ }
+
+ versionTransaction.oncomplete = function(e)
+ {
+ log("Second database upgrade success");
+ done();
+ }
+
+ versionTransaction.onabort = function(e)
+ {
+ log("Second database upgrade unexpected abort");
+ done();
+ }
+
+ versionTransaction.onerror = function(e)
+ {
+ log("Second database upgrade unexpected error");
+ done();
+ }
+ }
+
+ request.onsuccess = function(e)
+ {
+ log("Second database opening unexpected success");
+ done();
+ }
+
+ request.onerror = function(e)
+ {
+ log("Second database opening unexpected error");
+ done();
+ }
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> ALERT: [object IDBOpenDBRequest]
</span><del>-ALERT: error [object Event]
</del><ins>+ALERT: success
</ins><span class="cx"> ALERT: Done
</span><span class="cx"> This test calls deleteDatabase on window.indexedDB and verifies that an event is fired at the request.
</span><del>-While at this stage in modern IndexedDB development, that event is hardcoded to be an error.
</del><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> This test calls deleteDatabase on window.indexedDB and verifies that an event is fired at the request.<br>
</span><del>-While at this stage in modern IndexedDB development, that event is hardcoded to be an error.<br>
</del><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> if (window.testRunner) {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/ChangeLog 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -1,5 +1,57 @@
</span><span class="cx"> 2015-11-20 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: IDBFactory.deleteDatabase() support.
+ https://bugs.webkit.org/show_bug.cgi?id=151456
+
+ Reviewed by Alex Christensen.
+
+ Tests: storage/indexeddb/modern/deletedatabase-1.html
+ storage/indexeddb/modern/deletedatabase-2.html
+
+ * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+ (WebCore::IDBClient::IDBDatabase::hasPendingActivity):
+ (WebCore::IDBClient::IDBDatabase::didCommitOrAbortTransaction):
+ * Modules/indexeddb/client/IDBDatabaseImpl.h:
+
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBOpenDBRequest::onDeleteDatabaseSuccess):
+ (WebCore::IDBClient::IDBOpenDBRequest::requestCompleted):
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.h:
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::hasPendingActivity): Deleted.
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::deleteDatabase):
+ (WebCore::IDBServer::IDBServer::deleteUniqueIDBDatabase):
+ * Modules/indexeddb/server/IDBServer.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
+ (WebCore::IDBServer::UniqueIDBDatabase::hasAnyPendingCallbacks):
+ (WebCore::IDBServer::UniqueIDBDatabase::maybeDeleteDatabase):
+ (WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations):
+ (WebCore::IDBServer::UniqueIDBDatabase::handleDelete):
+ (WebCore::IDBServer::UniqueIDBDatabase::notifyConnectionsOfVersionChangeForUpgrade):
+ (WebCore::IDBServer::UniqueIDBDatabase::notifyConnectionsOfVersionChange):
+ (WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
+ (WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::invokeDeleteOrRunTransactionTimer):
+ (WebCore::IDBServer::UniqueIDBDatabase::deleteOrRunTransactionsTimerFired):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformActivateTransactionInBackingStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::inProgressTransactionCompleted):
+ (WebCore::IDBServer::UniqueIDBDatabase::invokeTransactionScheduler): Deleted.
+ (WebCore::IDBServer::UniqueIDBDatabase::transactionSchedulingTimerFired): Deleted.
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+ (WebCore::IDBServer::UniqueIDBDatabase::identifier):
+ (WebCore::IDBServer::UniqueIDBDatabase::deletePending):
+
+ * Modules/indexeddb/shared/IDBResultData.cpp:
+ (WebCore::IDBResultData::deleteDatabaseSuccess):
+ * Modules/indexeddb/shared/IDBResultData.h:
+
+2015-11-20 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Get IDBRequest.readyState right.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151484
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -62,6 +62,11 @@
</span><span class="cx"> m_serverConnection->unregisterDatabaseConnection(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool IDBDatabase::hasPendingActivity() const
+{
+ return !m_closedInServer;
+}
+
</ins><span class="cx"> const String IDBDatabase::name() const
</span><span class="cx"> {
</span><span class="cx"> return m_info.name();
</span><span class="lines">@@ -319,6 +324,9 @@
</span><span class="cx"> m_activeTransactions.remove(transaction.info().identifier());
</span><span class="cx"> m_committingTransactions.remove(transaction.info().identifier());
</span><span class="cx"> m_abortingTransactions.remove(transaction.info().identifier());
</span><ins>+
+ if (m_closePending)
+ maybeCloseInServer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBDatabase::fireVersionChangeEvent(uint64_t requestedVersion)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -94,6 +94,8 @@
</span><span class="cx">
</span><span class="cx"> void maybeCloseInServer();
</span><span class="cx">
</span><ins>+ virtual bool hasPendingActivity() const override final;
+
</ins><span class="cx"> Ref<IDBConnectionToServer> m_serverConnection;
</span><span class="cx"> IDBDatabaseInfo m_info;
</span><span class="cx"> uint64_t m_databaseConnectionIdentifier { 0 };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -101,6 +101,17 @@
</span><span class="cx"> enqueueEvent(IDBVersionChangeEvent::create(oldVersion, newVersion, eventNames().upgradeneededEvent));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBOpenDBRequest::onDeleteDatabaseSuccess(const IDBResultData& resultData)
+{
+ uint64_t oldVersion = resultData.databaseInfo().version();
+
+ LOG(IndexedDB, "IDBOpenDBRequest::onDeleteDatabaseSuccess() - current version is %" PRIu64, oldVersion);
+
+ m_readyState = IDBRequestReadyState::Done;
+
+ enqueueEvent(IDBVersionChangeEvent::create(oldVersion, 0, eventNames().successEvent));
+}
+
</ins><span class="cx"> void IDBOpenDBRequest::requestCompleted(const IDBResultData& data)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBOpenDBRequest::requestCompleted");
</span><span class="lines">@@ -115,6 +126,9 @@
</span><span class="cx"> case IDBResultType::OpenDatabaseUpgradeNeeded:
</span><span class="cx"> onUpgradeNeeded(data);
</span><span class="cx"> break;
</span><ins>+ case IDBResultType::DeleteDatabaseSuccess:
+ onDeleteDatabaseSuccess(data);
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> void onError(const IDBResultData&);
</span><span class="cx"> void onSuccess(const IDBResultData&);
</span><span class="cx"> void onUpgradeNeeded(const IDBResultData&);
</span><ins>+ void onDeleteDatabaseSuccess(const IDBResultData&);
</ins><span class="cx">
</span><span class="cx"> IDBDatabaseIdentifier m_databaseIdentifier;
</span><span class="cx"> uint64_t m_version { 0 };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -205,9 +205,6 @@
</span><span class="cx">
</span><span class="cx"> bool IDBTransaction::hasPendingActivity() const
</span><span class="cx"> {
</span><del>- if (m_state == IndexedDB::TransactionState::Inactive)
- return !m_transactionOperationQueue.isEmpty() || !m_transactionOperationMap.isEmpty();
-
</del><span class="cx"> return m_state != IndexedDB::TransactionState::Finished;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -135,13 +135,24 @@
</span><span class="cx"> // well as no way to message back failure.
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- // FIXME: During bringup of modern IDB, the database deletion is a no-op, and is
- // immediately reported back to the WebProcess as failure.
- auto result = IDBResultData::error(requestData.requestIdentifier(), IDBError(IDBExceptionCode::Unknown));
- connection->didDeleteDatabase(result);
</del><ins>+
+ auto* database = m_uniqueIDBDatabaseMap.get(requestData.databaseIdentifier());
+ if (!database) {
+ connection->didDeleteDatabase(IDBResultData::deleteDatabaseSuccess(requestData.requestIdentifier(), IDBDatabaseInfo(requestData.databaseIdentifier().databaseName(), 0)));
+ return;
+ }
+
+ database->handleDelete(*connection, requestData);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBServer::deleteUniqueIDBDatabase(UniqueIDBDatabase& database)
+{
+ LOG(IndexedDB, "IDBServer::deleteUniqueIDBDatabase");
+
+ auto deletedDatabase = m_uniqueIDBDatabaseMap.take(database.identifier());
+ ASSERT_UNUSED(deletedDatabase, deletedDatabase.get() == &database);
+}
+
</ins><span class="cx"> void IDBServer::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBServer::abortTransaction");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -83,6 +83,8 @@
</span><span class="cx"> void registerTransaction(UniqueIDBDatabaseTransaction&);
</span><span class="cx"> void unregisterTransaction(UniqueIDBDatabaseTransaction&);
</span><span class="cx">
</span><ins>+ void deleteUniqueIDBDatabase(UniqueIDBDatabase&);
+
</ins><span class="cx"> std::unique_ptr<IDBBackingStore> createBackingStore(const IDBDatabaseIdentifier&);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> UniqueIDBDatabase::UniqueIDBDatabase(IDBServer& server, const IDBDatabaseIdentifier& identifier)
</span><span class="cx"> : m_server(server)
</span><span class="cx"> , m_identifier(identifier)
</span><del>- , m_transactionSchedulingTimer(*this, &UniqueIDBDatabase::transactionSchedulingTimerFired)
</del><ins>+ , m_deleteOrRunTransactionsTimer(*this, &UniqueIDBDatabase::deleteOrRunTransactionsTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,6 +67,44 @@
</span><span class="cx"> m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::openBackingStore, m_identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabase::hasAnyPendingCallbacks() const
+{
+ return !m_errorCallbacks.isEmpty()
+ || !m_keyDataCallbacks.isEmpty()
+ || !m_getResultCallbacks.isEmpty()
+ || !m_countCallbacks.isEmpty();
+}
+
+bool UniqueIDBDatabase::maybeDeleteDatabase()
+{
+ ASSERT(isMainThread());
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::maybeDeleteDatabase");
+
+ if (hasAnyOpenConnections() || !m_closePendingDatabaseConnections.isEmpty()) {
+ // Exactly once, notify all open connections of the pending deletion.
+ if (!m_hasNotifiedConnectionsOfDelete) {
+ notifyConnectionsOfVersionChange(0);
+ m_hasNotifiedConnectionsOfDelete = true;
+ }
+ return false;
+ }
+
+ ASSERT(!hasAnyPendingCallbacks());
+ ASSERT(m_inProgressTransactions.isEmpty());
+ ASSERT(m_pendingTransactions.isEmpty());
+ ASSERT(m_openDatabaseConnections.isEmpty());
+ ASSERT(m_pendingOpenDatabaseOperations.isEmpty());
+
+ for (auto& operation : m_pendingDeleteDatabaseOperations) {
+ ASSERT(m_databaseInfo);
+ operation->connection().didDeleteDatabase(IDBResultData::deleteDatabaseSuccess(operation->requestData().requestIdentifier(), *m_databaseInfo));
+ }
+
+ m_server.deleteUniqueIDBDatabase(*this);
+
+ return true;
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::handleOpenDatabaseOperations()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -119,7 +157,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Otherwise we have to notify all those open connections and wait for them to close.
</span><del>- notifyConnectionsOfVersionChange();
</del><ins>+ notifyConnectionsOfVersionChangeForUpgrade();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabase::hasAnyOpenConnections() const
</span><span class="lines">@@ -166,6 +204,23 @@
</span><span class="cx"> return identifier;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::handleDelete(IDBConnectionToClient& connection, const IDBRequestData& requestData)
+{
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDelete");
+
+ auto operation = IDBServerOperation::create(connection, requestData);
+ m_pendingDeleteDatabaseOperations.append(WTF::move(operation));
+
+ // If a different request has already come in to delete this database, there's nothing left to do.
+ // A delete is already in progress, and this request will be handled along with all the rest.
+ if (m_deletePending)
+ return;
+
+ m_deletePending = true;
+
+ maybeDeleteDatabase();
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::startVersionChangeTransaction()
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::startVersionChangeTransaction");
</span><span class="lines">@@ -197,13 +252,16 @@
</span><span class="cx"> m_backingStore->beginTransaction(info);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::notifyConnectionsOfVersionChange()
</del><ins>+void UniqueIDBDatabase::notifyConnectionsOfVersionChangeForUpgrade()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_versionChangeOperation);
</span><span class="cx"> ASSERT(m_versionChangeDatabaseConnection);
</span><span class="cx">
</span><del>- uint64_t requestedVersion = m_versionChangeOperation->requestData().requestedVersion();
</del><ins>+ notifyConnectionsOfVersionChange(m_versionChangeOperation->requestData().requestedVersion());
+}
</ins><span class="cx">
</span><ins>+void UniqueIDBDatabase::notifyConnectionsOfVersionChange(uint64_t requestedVersion)
+{
</ins><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::notifyConnectionsOfVersionChange - %" PRIu64, requestedVersion);
</span><span class="cx">
</span><span class="cx"> // 3.3.7 "versionchange" transaction steps
</span><span class="lines">@@ -735,14 +793,24 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_openDatabaseConnections.contains(&connection));
</span><span class="cx">
</span><ins>+ Deque<RefPtr<UniqueIDBDatabaseTransaction>> pendingTransactions;
+ while (!m_pendingTransactions.isEmpty()) {
+ auto transaction = m_pendingTransactions.takeFirst();
+ if (&transaction->databaseConnection() != &connection)
+ pendingTransactions.append(WTF::move(transaction));
+ }
+
+ if (!pendingTransactions.isEmpty())
+ m_pendingTransactions.swap(pendingTransactions);
+
</ins><span class="cx"> auto removedConnection = m_openDatabaseConnections.take(&connection);
</span><span class="cx"> if (removedConnection->hasNonFinishedTransactions()) {
</span><span class="cx"> m_closePendingDatabaseConnections.add(WTF::move(removedConnection));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Now that a database connection has closed, previously blocked transactions might be runnable.
- invokeTransactionScheduler();
</del><ins>+ // Now that a database connection has closed, previously blocked operations might be runnable.
+ invokeDeleteOrRunTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::enqueueTransaction(Ref<UniqueIDBDatabaseTransaction>&& transaction)
</span><span class="lines">@@ -753,19 +821,23 @@
</span><span class="cx">
</span><span class="cx"> m_pendingTransactions.append(WTF::move(transaction));
</span><span class="cx">
</span><del>- invokeTransactionScheduler();
</del><ins>+ invokeDeleteOrRunTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::invokeTransactionScheduler()
</del><ins>+void UniqueIDBDatabase::invokeDeleteOrRunTransactionTimer()
</ins><span class="cx"> {
</span><del>- if (!m_transactionSchedulingTimer.isActive())
- m_transactionSchedulingTimer.startOneShot(0);
</del><ins>+ if (!m_deleteOrRunTransactionsTimer.isActive())
+ m_deleteOrRunTransactionsTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::transactionSchedulingTimerFired()
</del><ins>+void UniqueIDBDatabase::deleteOrRunTransactionsTimerFired()
</ins><span class="cx"> {
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::transactionSchedulingTimerFired");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::deleteOrRunTransactionsTimerFired");
</ins><span class="cx">
</span><ins>+ if (m_deletePending && maybeDeleteDatabase())
+ return;
+
+ // If the database was not deleted in the previous step, try to run a transaction now.
</ins><span class="cx"> if (m_pendingTransactions.isEmpty()) {
</span><span class="cx"> if (!hasAnyOpenConnections() && m_versionChangeOperation) {
</span><span class="cx"> startVersionChangeTransaction();
</span><span class="lines">@@ -785,7 +857,7 @@
</span><span class="cx">
</span><span class="cx"> // If no transactions were deferred, it's possible we can start another transaction right now.
</span><span class="cx"> if (!hadDeferredTransactions)
</span><del>- invokeTransactionScheduler();
</del><ins>+ invokeDeleteOrRunTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -816,7 +888,7 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformActivateTransactionInBackingStore");
</span><span class="cx">
</span><del>- invokeTransactionScheduler();
</del><ins>+ invokeDeleteOrRunTransactionTimer();
</ins><span class="cx">
</span><span class="cx"> performErrorCallback(callbackIdentifier, error);
</span><span class="cx"> }
</span><span class="lines">@@ -888,8 +960,11 @@
</span><span class="cx"> for (auto objectStore : transaction->objectStoreIdentifiers())
</span><span class="cx"> m_objectStoreTransactionCounts.remove(objectStore);
</span><span class="cx">
</span><del>- // Previously blocked transactions might now be unblocked.
- invokeTransactionScheduler();
</del><ins>+ if (!transaction->databaseConnection().hasNonFinishedTransactions())
+ m_closePendingDatabaseConnections.remove(&transaction->databaseConnection());
+
+ // Previously blocked operations might be runnable.
+ invokeDeleteOrRunTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::performErrorCallback(uint64_t callbackIdentifier, const IDBError& error)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> const IDBDatabaseInfo& info() const;
</span><span class="cx"> IDBServer& server() { return m_server; }
</span><ins>+ const IDBDatabaseIdentifier& identifier() const { return m_identifier; }
</ins><span class="cx">
</span><span class="cx"> void createObjectStore(UniqueIDBDatabaseTransaction&, const IDBObjectStoreInfo&, ErrorCallback);
</span><span class="cx"> void deleteObjectStore(UniqueIDBDatabaseTransaction&, const String& objectStoreName, ErrorCallback);
</span><span class="lines">@@ -93,15 +94,20 @@
</span><span class="cx">
</span><span class="cx"> void enqueueTransaction(Ref<UniqueIDBDatabaseTransaction>&&);
</span><span class="cx">
</span><ins>+ void handleDelete(IDBConnectionToClient&, const IDBRequestData&);
+ bool deletePending() const { return m_deletePending; }
+
</ins><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(IDBServer&, const IDBDatabaseIdentifier&);
</span><span class="cx">
</span><span class="cx"> void handleOpenDatabaseOperations();
</span><span class="cx"> void addOpenDatabaseConnection(Ref<UniqueIDBDatabaseConnection>&&);
</span><ins>+ bool maybeDeleteDatabase();
</ins><span class="cx"> bool hasAnyOpenConnections() const;
</span><span class="cx">
</span><span class="cx"> void startVersionChangeTransaction();
</span><del>- void notifyConnectionsOfVersionChange();
</del><ins>+ void notifyConnectionsOfVersionChangeForUpgrade();
+ void notifyConnectionsOfVersionChange(uint64_t requestedVersion);
</ins><span class="cx">
</span><span class="cx"> void activateTransactionInBackingStore(UniqueIDBDatabaseTransaction&);
</span><span class="cx"> void inProgressTransactionCompleted(const IDBResourceIdentifier&);
</span><span class="lines">@@ -152,14 +158,17 @@
</span><span class="cx"> void performGetResultCallback(uint64_t callbackIdentifier, const IDBError&, const IDBGetResult&);
</span><span class="cx"> void performCountCallback(uint64_t callbackIdentifier, const IDBError&, uint64_t);
</span><span class="cx">
</span><del>- void invokeTransactionScheduler();
- void transactionSchedulingTimerFired();
</del><ins>+ bool hasAnyPendingCallbacks() const;
+
+ void invokeDeleteOrRunTransactionTimer();
+ void deleteOrRunTransactionsTimerFired();
</ins><span class="cx"> RefPtr<UniqueIDBDatabaseTransaction> takeNextRunnableTransaction(bool& hadDeferredTransactions);
</span><span class="cx">
</span><span class="cx"> IDBServer& m_server;
</span><span class="cx"> IDBDatabaseIdentifier m_identifier;
</span><span class="cx">
</span><span class="cx"> Deque<Ref<IDBServerOperation>> m_pendingOpenDatabaseOperations;
</span><ins>+ Deque<Ref<IDBServerOperation>> m_pendingDeleteDatabaseOperations;
</ins><span class="cx">
</span><span class="cx"> HashSet<RefPtr<UniqueIDBDatabaseConnection>> m_openDatabaseConnections;
</span><span class="cx"> HashSet<RefPtr<UniqueIDBDatabaseConnection>> m_closePendingDatabaseConnections;
</span><span class="lines">@@ -176,7 +185,7 @@
</span><span class="cx"> HashMap<uint64_t, GetResultCallback> m_getResultCallbacks;
</span><span class="cx"> HashMap<uint64_t, CountCallback> m_countCallbacks;
</span><span class="cx">
</span><del>- Timer m_transactionSchedulingTimer;
</del><ins>+ Timer m_deleteOrRunTransactionsTimer;
</ins><span class="cx">
</span><span class="cx"> Deque<RefPtr<UniqueIDBDatabaseTransaction>> m_pendingTransactions;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<UniqueIDBDatabaseTransaction>> m_inProgressTransactions;
</span><span class="lines">@@ -186,6 +195,9 @@
</span><span class="cx"> // This helps make sure opening narrowly scoped transactions (one or two object stores)
</span><span class="cx"> // doesn't continuously block widely scoped write transactions.
</span><span class="cx"> HashCountedSet<uint64_t> m_objectStoreTransactionCounts;
</span><ins>+
+ bool m_deletePending { false };
+ bool m_hasNotifiedConnectionsOfDelete { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IDBServer
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResultDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.cpp 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -90,6 +90,13 @@
</span><span class="cx"> return WTF::move(result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBResultData IDBResultData::deleteDatabaseSuccess(const IDBResourceIdentifier& requestIdentifier, const IDBDatabaseInfo& info)
+{
+ IDBResultData result(IDBResultType::DeleteDatabaseSuccess, requestIdentifier);
+ result.m_databaseInfo = std::make_unique<IDBDatabaseInfo>(info);
+ return result;
+}
+
</ins><span class="cx"> IDBResultData IDBResultData::createObjectStoreSuccess(const IDBResourceIdentifier& requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> return { IDBResultType::CreateObjectStoreSuccess, requestIdentifier };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResultDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h (192686 => 192687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2015-11-20 18:55:11 UTC (rev 192686)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2015-11-20 18:55:42 UTC (rev 192687)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> Error,
</span><span class="cx"> OpenDatabaseSuccess,
</span><span class="cx"> OpenDatabaseUpgradeNeeded,
</span><ins>+ DeleteDatabaseSuccess,
</ins><span class="cx"> CreateObjectStoreSuccess,
</span><span class="cx"> DeleteObjectStoreSuccess,
</span><span class="cx"> ClearObjectStoreSuccess,
</span><span class="lines">@@ -68,6 +69,7 @@
</span><span class="cx"> static IDBResultData error(const IDBResourceIdentifier&, const IDBError&);
</span><span class="cx"> static IDBResultData openDatabaseSuccess(const IDBResourceIdentifier&, IDBServer::UniqueIDBDatabaseConnection&);
</span><span class="cx"> static IDBResultData openDatabaseUpgradeNeeded(const IDBResourceIdentifier&, IDBServer::UniqueIDBDatabaseTransaction&);
</span><ins>+ static IDBResultData deleteDatabaseSuccess(const IDBResourceIdentifier&, const IDBDatabaseInfo&);
</ins><span class="cx"> static IDBResultData createObjectStoreSuccess(const IDBResourceIdentifier&);
</span><span class="cx"> static IDBResultData deleteObjectStoreSuccess(const IDBResourceIdentifier&);
</span><span class="cx"> static IDBResultData clearObjectStoreSuccess(const IDBResourceIdentifier&);
</span></span></pre>
</div>
</div>
</body>
</html>