<!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>[200695] 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/200695">200695</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-11 11:42:03 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: IDBOpenDBRequests that are stop()'ed don't notify the IDBServer of that fact.
https://bugs.webkit.org/show_bug.cgi?id=157448
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (Previously skipped tests cover new behavior, and are now unskipped).
There's two main parts to this patch:
1 - When an IDBOpenDBRequest is stop()'ed due to page navigation or worker termination,
we now notify the IDBServer of that.
2 - Lot's of little tweaks to UniqueIDBDatabase to handle shutting down version change
transactions and/or connections related to the cancelled openDB request.
Fortunately the changes to UniqueIDBDatabase were all well covered by existing tests.
* Modules/indexeddb/IDBOpenDBRequest.cpp:
(WebCore::IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit):
(WebCore::IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion):
(WebCore::IDBOpenDBRequest::cancelForStop):
(WebCore::IDBOpenDBRequest::dispatchEvent):
* Modules/indexeddb/IDBOpenDBRequest.h:
* Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::stop):
(WebCore::IDBRequest::cancelForStop):
* Modules/indexeddb/IDBRequest.h:
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::openDBRequestCancelled):
(WebCore::IDBClient::IDBConnectionProxy::didFinishHandlingVersionChangeTransaction):
* Modules/indexeddb/client/IDBConnectionProxy.h:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::didFinishHandlingVersionChangeTransaction):
(WebCore::IDBClient::IDBConnectionToServer::openDBRequestCancelled):
* Modules/indexeddb/client/IDBConnectionToServer.h:
* Modules/indexeddb/client/IDBConnectionToServerDelegate.h:
* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::didFinishHandlingVersionChangeTransaction):
(WebCore::IDBServer::IDBServer::databaseConnectionClosed):
(WebCore::IDBServer::IDBServer::openDBRequestCancelled):
* Modules/indexeddb/server/IDBServer.h:
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::didDeleteBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::handleCurrentOperation):
(WebCore::IDBServer::UniqueIDBDatabase::openDBRequestCancelled):
(WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::performCommitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformCommitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::abortTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::didFinishHandlingVersionChange):
(WebCore::IDBServer::UniqueIDBDatabase::performAbortTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformAbortTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
(WebCore::IDBServer::UniqueIDBDatabase::transactionCompleted):
(WebCore::IDBServer::UniqueIDBDatabase::forgetErrorCallback):
* Modules/indexeddb/server/UniqueIDBDatabase.h:
* Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseConnection::abortTransactionWithoutCallback):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::didFinishHandlingVersionChange):
* Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::didFinishHandlingVersionChange): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
* Modules/indexeddb/shared/InProcessIDBServer.cpp:
(WebCore::InProcessIDBServer::didFinishHandlingVersionChangeTransaction):
(WebCore::InProcessIDBServer::openDBRequestCancelled):
* Modules/indexeddb/shared/InProcessIDBServer.h:
Source/WebKit2:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
(WebKit::WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction):
(WebKit::WebIDBConnectionToClient::openDBRequestCancelled):
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
(WebKit::WebIDBConnectionToServer::didFinishHandlingVersionChangeTransaction):
(WebKit::WebIDBConnectionToServer::openDBRequestCancelled):
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
LayoutTests:
* TestExpectations:
* storage/indexeddb/pending-version-change-stuck-private-expected.txt:
* storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt:
* storage/indexeddb/pending-version-change-stuck-works-with-terminate-private-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbpendingversionchangestuckprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbpendingversionchangestuckworkswithterminateexpectedtxt">trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbpendingversionchangestuckworkswithterminateprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-private-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBOpenDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBOpenDBRequesth">trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBRequesth">trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerDelegateh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h</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="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectioncpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectionh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseTransactionh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh">trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClienth">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientmessagesin">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServercpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServerh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/LayoutTests/ChangeLog 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-11 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: IDBOpenDBRequests that are stop()'ed don't notify the IDBServer of that fact.
+ https://bugs.webkit.org/show_bug.cgi?id=157448
+
+ Reviewed by Alex Christensen.
+
+ * TestExpectations:
+ * storage/indexeddb/pending-version-change-stuck-private-expected.txt:
+ * storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt:
+ * storage/indexeddb/pending-version-change-stuck-works-with-terminate-private-expected.txt:
+
</ins><span class="cx"> 2016-05-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve error messages for accessing arguments.callee and similar getters in strict mode
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/LayoutTests/TestExpectations 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -913,12 +913,6 @@
</span><span class="cx"> # Could be a SessionID difference? Something is giving the worker a different namespace.
</span><span class="cx"> storage/indexeddb/dont-commit-on-blocked-private.html [ Failure ]
</span><span class="cx">
</span><del>-# IDB workers tests that timeout
-storage/indexeddb/pending-version-change-stuck.html
-storage/indexeddb/pending-version-change-stuck-private.html
-storage/indexeddb/pending-version-change-stuck-works-with-terminate.html
-storage/indexeddb/pending-version-change-stuck-works-with-terminate-private.html
-
</del><span class="cx"> # Test's behavior specific to Legacy IDB with LevelDB backend
</span><span class="cx"> # Modern IDB is spec-compliant without supporting this behavior
</span><span class="cx"> storage/indexeddb/transaction-starvation.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbpendingversionchangestuckprivateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-private-expected.txt (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-private-expected.txt 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-private-expected.txt 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
</span><span class="cx">
</span><del>-request = indexedDB.open("pending-version-change-stuck.html")
</del><ins>+request = indexedDB.open("pending-version-change-stuck-private.html")
</ins><span class="cx"> PASS Open worked after page reload.
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbpendingversionchangestuckworkswithterminateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-expected.txt 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx">
</span><span class="cx"> indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
</span><span class="cx">
</span><del>-dbname = "pending-version-change-stuck-works-with-terminate.html"
</del><span class="cx"> indexedDB.open(dbname)
</span><span class="cx"> PASS Open worked after page reload.
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbpendingversionchangestuckworkswithterminateprivateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-private-expected.txt (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-private-expected.txt 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-stuck-works-with-terminate-private-expected.txt 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx">
</span><span class="cx"> indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
</span><span class="cx">
</span><del>-dbname = "pending-version-change-stuck-works-with-terminate.html"
</del><span class="cx"> indexedDB.open(dbname)
</span><span class="cx"> PASS Open worked after page reload.
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/ChangeLog 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -1,3 +1,81 @@
</span><ins>+2016-05-11 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: IDBOpenDBRequests that are stop()'ed don't notify the IDBServer of that fact.
+ https://bugs.webkit.org/show_bug.cgi?id=157448
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Previously skipped tests cover new behavior, and are now unskipped).
+
+ There's two main parts to this patch:
+
+ 1 - When an IDBOpenDBRequest is stop()'ed due to page navigation or worker termination,
+ we now notify the IDBServer of that.
+ 2 - Lot's of little tweaks to UniqueIDBDatabase to handle shutting down version change
+ transactions and/or connections related to the cancelled openDB request.
+
+ Fortunately the changes to UniqueIDBDatabase were all well covered by existing tests.
+
+ * Modules/indexeddb/IDBOpenDBRequest.cpp:
+ (WebCore::IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit):
+ (WebCore::IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion):
+ (WebCore::IDBOpenDBRequest::cancelForStop):
+ (WebCore::IDBOpenDBRequest::dispatchEvent):
+ * Modules/indexeddb/IDBOpenDBRequest.h:
+
+ * Modules/indexeddb/IDBRequest.cpp:
+ (WebCore::IDBRequest::stop):
+ (WebCore::IDBRequest::cancelForStop):
+ * Modules/indexeddb/IDBRequest.h:
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::openDBRequestCancelled):
+ (WebCore::IDBClient::IDBConnectionProxy::didFinishHandlingVersionChangeTransaction):
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::didFinishHandlingVersionChangeTransaction):
+ (WebCore::IDBClient::IDBConnectionToServer::openDBRequestCancelled):
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+
+ * Modules/indexeddb/client/IDBConnectionToServerDelegate.h:
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::didFinishHandlingVersionChangeTransaction):
+ (WebCore::IDBServer::IDBServer::databaseConnectionClosed):
+ (WebCore::IDBServer::IDBServer::openDBRequestCancelled):
+ * Modules/indexeddb/server/IDBServer.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::didDeleteBackingStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::handleCurrentOperation):
+ (WebCore::IDBServer::UniqueIDBDatabase::openDBRequestCancelled):
+ (WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::performCommitTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformCommitTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::abortTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::didFinishHandlingVersionChange):
+ (WebCore::IDBServer::UniqueIDBDatabase::performAbortTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformAbortTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
+ (WebCore::IDBServer::UniqueIDBDatabase::transactionCompleted):
+ (WebCore::IDBServer::UniqueIDBDatabase::forgetErrorCallback):
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseConnection::abortTransactionWithoutCallback):
+ (WebCore::IDBServer::UniqueIDBDatabaseConnection::didFinishHandlingVersionChange):
+ * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseTransaction::didFinishHandlingVersionChange): Deleted.
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h:
+
+ * Modules/indexeddb/shared/InProcessIDBServer.cpp:
+ (WebCore::InProcessIDBServer::didFinishHandlingVersionChangeTransaction):
+ (WebCore::InProcessIDBServer::openDBRequestCancelled):
+ * Modules/indexeddb/shared/InProcessIDBServer.h:
+
</ins><span class="cx"> 2016-05-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200686.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBOpenDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit()
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit()");
</del><ins>+ LOG(IndexedDB, "IDBOpenDBRequest::fireSuccessAfterVersionChangeCommit() - %s", resourceIdentifier().loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="cx"> ASSERT(hasPendingActivity());
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion()
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion()");
</del><ins>+ LOG(IndexedDB, "IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion() - %s", resourceIdentifier().loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="cx"> ASSERT(hasPendingActivity());
</span><span class="lines">@@ -111,6 +111,11 @@
</span><span class="cx"> enqueueEvent(IDBRequestCompletionEvent::create(eventNames().errorEvent, true, true, *this));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBOpenDBRequest::cancelForStop()
+{
+ connectionProxy().openDBRequestCancelled({ connectionProxy(), *this });
+}
+
</ins><span class="cx"> bool IDBOpenDBRequest::dispatchEvent(Event& event)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="lines">@@ -118,7 +123,7 @@
</span><span class="cx"> bool result = IDBRequest::dispatchEvent(event);
</span><span class="cx">
</span><span class="cx"> if (m_transaction && m_transaction->isVersionChange() && (event.type() == eventNames().errorEvent || event.type() == eventNames().successEvent))
</span><del>- m_transaction->database().connectionProxy().didFinishHandlingVersionChangeTransaction(*m_transaction);
</del><ins>+ m_transaction->database().connectionProxy().didFinishHandlingVersionChangeTransaction(m_transaction->database().databaseConnectionIdentifier(), *m_transaction);
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBOpenDBRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx">
</span><span class="cx"> bool dispatchEvent(Event&) final;
</span><span class="cx">
</span><ins>+ void cancelForStop() final;
+
</ins><span class="cx"> void onError(const IDBResultData&);
</span><span class="cx"> void onSuccess(const IDBResultData&);
</span><span class="cx"> void onUpgradeNeeded(const IDBResultData&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -242,11 +242,18 @@
</span><span class="cx"> ASSERT(currentThread() == m_originThreadID);
</span><span class="cx"> ASSERT(!m_contextStopped);
</span><span class="cx">
</span><ins>+ cancelForStop();
+
</ins><span class="cx"> removeAllEventListeners();
</span><span class="cx">
</span><span class="cx"> m_contextStopped = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBRequest::cancelForStop()
+{
+ // The base IDBRequest class has nothing additional to do here.
+}
+
</ins><span class="cx"> void IDBRequest::enqueueEvent(Ref<Event>&& event)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(currentThread() == m_originThreadID);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> const char* activeDOMObjectName() const final;
</span><span class="cx"> bool canSuspendForDocumentSuspension() const final;
</span><span class="cx"> void stop() final;
</span><ins>+ virtual void cancelForStop();
</ins><span class="cx">
</span><span class="cx"> void refEventTarget() final { RefCounted::ref(); }
</span><span class="cx"> void derefEventTarget() final { RefCounted::deref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -293,6 +293,11 @@
</span><span class="cx"> performCallbackOnCorrectThread(*request, &IDBOpenDBRequest::requestBlocked, oldVersion, newVersion);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionProxy::openDBRequestCancelled(const IDBRequestData& requestData)
+{
+ callConnectionOnMainThread(&IDBConnectionToServer::openDBRequestCancelled, requestData);
+}
+
</ins><span class="cx"> void IDBConnectionProxy::establishTransaction(IDBTransaction& transaction)
</span><span class="cx"> {
</span><span class="cx"> {
</span><span class="lines">@@ -373,9 +378,9 @@
</span><span class="cx"> return m_pendingTransactions.contains(identifier) || m_committingTransactions.contains(identifier) || m_abortingTransactions.contains(identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionProxy::didFinishHandlingVersionChangeTransaction(IDBTransaction& transaction)
</del><ins>+void IDBConnectionProxy::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, IDBTransaction& transaction)
</ins><span class="cx"> {
</span><del>- callConnectionOnMainThread(&IDBConnectionToServer::didFinishHandlingVersionChangeTransaction, transaction.info().identifier());
</del><ins>+ callConnectionOnMainThread(&IDBConnectionToServer::didFinishHandlingVersionChangeTransaction, databaseConnectionIdentifier, transaction.info().identifier());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::databaseConnectionClosed(IDBDatabase& database)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier);
</span><span class="cx">
</span><span class="cx"> void notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion);
</span><ins>+ void openDBRequestCancelled(const IDBRequestData&);
</ins><span class="cx">
</span><span class="cx"> void establishTransaction(IDBTransaction&);
</span><span class="cx"> void commitTransaction(IDBTransaction&);
</span><span class="lines">@@ -89,7 +90,7 @@
</span><span class="cx"> void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx"> void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx">
</span><del>- void didFinishHandlingVersionChangeTransaction(IDBTransaction&);
</del><ins>+ void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, IDBTransaction&);
</ins><span class="cx"> void databaseConnectionClosed(IDBDatabase&);
</span><span class="cx">
</span><span class="cx"> void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -268,12 +268,12 @@
</span><span class="cx"> m_proxy->didCommitTransaction(transactionIdentifier, error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</del><ins>+void IDBConnectionToServer::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::didFinishHandlingVersionChangeTransaction");
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- m_delegate->didFinishHandlingVersionChangeTransaction(transactionIdentifier);
</del><ins>+ m_delegate->didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionToServer::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
</span><span class="lines">@@ -324,6 +324,14 @@
</span><span class="cx"> m_proxy->notifyOpenDBRequestBlocked(requestIdentifier, oldVersion, newVersion);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionToServer::openDBRequestCancelled(const IDBRequestData& requestData)
+{
+ LOG(IndexedDB, "IDBConnectionToServer::openDBRequestCancelled");
+ ASSERT(isMainThread());
+
+ m_delegate->openDBRequestCancelled(requestData);
+}
+
</ins><span class="cx"> void IDBConnectionToServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBConnectionToServer::databaseConnectionClosed");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> void commitTransaction(const IDBResourceIdentifier& transactionIdentifier);
</span><span class="cx"> WEBCORE_EXPORT void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx">
</span><del>- void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&);
</del><ins>+ void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier&);
</ins><span class="cx">
</span><span class="cx"> void abortTransaction(const IDBResourceIdentifier& transactionIdentifier);
</span><span class="cx"> WEBCORE_EXPORT void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx"> WEBCORE_EXPORT void notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion);
</span><ins>+ void openDBRequestCancelled(const IDBRequestData&);
</ins><span class="cx">
</span><span class="cx"> void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef IDBConnectionToServerDelegate_h
-#define IDBConnectionToServerDelegate_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="lines">@@ -60,7 +59,7 @@
</span><span class="cx"> virtual void openDatabase(const IDBRequestData&) = 0;
</span><span class="cx"> virtual void abortTransaction(const IDBResourceIdentifier&) = 0;
</span><span class="cx"> virtual void commitTransaction(const IDBResourceIdentifier&) = 0;
</span><del>- virtual void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&) = 0;
</del><ins>+ virtual void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier&) = 0;
</ins><span class="cx"> virtual void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&) = 0;
</span><span class="cx"> virtual void deleteObjectStore(const IDBRequestData&, const String& objectStoreName) = 0;
</span><span class="cx"> virtual void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier) = 0;
</span><span class="lines">@@ -77,6 +76,7 @@
</span><span class="cx"> virtual void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) = 0;
</span><span class="cx"> virtual void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) = 0;
</span><span class="cx"> virtual void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier) = 0;
</span><ins>+ virtual void openDBRequestCancelled(const IDBRequestData&) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void getAllDatabaseNames(const SecurityOriginData& mainFrameOrigin, const SecurityOriginData& openingOrigin, uint64_t callbackID) = 0;
</span><span class="cx">
</span><span class="lines">@@ -88,4 +88,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><del>-#endif // IDBConnectionToServerDelegate_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -332,20 +332,20 @@
</span><span class="cx"> transaction->commit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBServer::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</del><ins>+void IDBServer::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBServer::didFinishHandlingVersionChangeTransaction");
</del><ins>+ LOG(IndexedDB, "IDBServer::didFinishHandlingVersionChangeTransaction - %s", transactionIdentifier.loggingString().utf8().data());
</ins><span class="cx">
</span><del>- auto transaction = m_transactions.get(transactionIdentifier);
- if (!transaction)
</del><ins>+ auto* connection = m_databaseConnections.get(databaseConnectionIdentifier);
+ if (!connection)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- transaction->didFinishHandlingVersionChange();
</del><ins>+ connection->didFinishHandlingVersionChange(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "IDBServer::databaseConnectionClosed");
</del><ins>+ LOG(IndexedDB, "IDBServer::databaseConnectionClosed - %" PRIu64, databaseConnectionIdentifier);
</ins><span class="cx">
</span><span class="cx"> auto databaseConnection = m_databaseConnections.get(databaseConnectionIdentifier);
</span><span class="cx"> if (!databaseConnection)
</span><span class="lines">@@ -377,6 +377,17 @@
</span><span class="cx"> databaseConnection->didFireVersionChangeEvent(requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBServer::openDBRequestCancelled(const IDBRequestData& requestData)
+{
+ LOG(IndexedDB, "IDBServer::openDBRequestCancelled");
+
+ auto* uniqueIDBDatabase = m_uniqueIDBDatabaseMap.get(requestData.databaseIdentifier());
+ if (!uniqueIDBDatabase)
+ return;
+
+ uniqueIDBDatabase->openDBRequestCancelled(requestData.requestIdentifier());
+}
+
</ins><span class="cx"> void IDBServer::getAllDatabaseNames(uint64_t serverConnectionIdentifier, const SecurityOriginData& mainFrameOrigin, const SecurityOriginData& openingOrigin, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> postDatabaseTask(createCrossThreadTask(*this, &IDBServer::performGetAllDatabaseNames, serverConnectionIdentifier, mainFrameOrigin, openingOrigin, callbackID));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef IDBServer_h
-#define IDBServer_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="lines">@@ -64,7 +63,7 @@
</span><span class="cx"> WEBCORE_EXPORT void deleteDatabase(const IDBRequestData&);
</span><span class="cx"> WEBCORE_EXPORT void abortTransaction(const IDBResourceIdentifier&);
</span><span class="cx"> WEBCORE_EXPORT void commitTransaction(const IDBResourceIdentifier&);
</span><del>- WEBCORE_EXPORT void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&);
</del><ins>+ WEBCORE_EXPORT void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier&);
</ins><span class="cx"> WEBCORE_EXPORT void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&);
</span><span class="cx"> WEBCORE_EXPORT void deleteObjectStore(const IDBRequestData&, const String& objectStoreName);
</span><span class="cx"> WEBCORE_EXPORT void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier);
</span><span class="lines">@@ -81,6 +80,7 @@
</span><span class="cx"> WEBCORE_EXPORT void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
</span><span class="cx"> WEBCORE_EXPORT void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier);
</span><span class="cx"> WEBCORE_EXPORT void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier);
</span><ins>+ WEBCORE_EXPORT void openDBRequestCancelled(const IDBRequestData&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void getAllDatabaseNames(uint64_t serverConnectionIdentifier, const SecurityOriginData& mainFrameOrigin, const SecurityOriginData& openingOrigin, uint64_t callbackID);
</span><span class="cx">
</span><span class="lines">@@ -131,4 +131,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><del>-#endif // IDBServer_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -74,8 +74,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::openDatabaseConnection(IDBConnectionToClient& connection, const IDBRequestData& requestData)
</span><span class="cx"> {
</span><del>- auto operation = ServerOpenDBRequest::create(connection, requestData);
- m_pendingOpenDBRequests.append(WTFMove(operation));
</del><ins>+ m_pendingOpenDBRequests.add(ServerOpenDBRequest::create(connection, requestData));
</ins><span class="cx">
</span><span class="cx"> // An open operation is already in progress, so we can't possibly handle this one yet.
</span><span class="cx"> if (m_isOpeningBackingStore)
</span><span class="lines">@@ -247,13 +246,15 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::didDeleteBackingStore");
</span><span class="cx">
</span><del>- ASSERT(m_currentOpenDBRequest);
- ASSERT(m_currentOpenDBRequest->isDeleteRequest());
</del><span class="cx"> ASSERT(!hasAnyPendingCallbacks());
</span><span class="cx"> ASSERT(!hasUnfinishedTransactions());
</span><span class="cx"> ASSERT(m_pendingTransactions.isEmpty());
</span><span class="cx"> ASSERT(m_openDatabaseConnections.isEmpty());
</span><span class="cx">
</span><ins>+ // It's possible that the openDBRequest was cancelled from client-side after the delete was already dispatched to the backingstore.
+ // So it's okay if we don't have a currentOpenDBRequest, but if we do it has to be a deleteRequest.
+ ASSERT(!m_currentOpenDBRequest || m_currentOpenDBRequest->isDeleteRequest());
+
</ins><span class="cx"> if (m_databaseInfo)
</span><span class="cx"> m_mostRecentDeletedDatabaseInfo = WTFMove(m_databaseInfo);
</span><span class="cx">
</span><span class="lines">@@ -263,24 +264,29 @@
</span><span class="cx"> if (!m_mostRecentDeletedDatabaseInfo)
</span><span class="cx"> m_mostRecentDeletedDatabaseInfo = std::make_unique<IDBDatabaseInfo>(m_identifier.databaseName(), deletedVersion);
</span><span class="cx">
</span><del>- m_currentOpenDBRequest->notifyDidDeleteDatabase(*m_mostRecentDeletedDatabaseInfo);
- m_currentOpenDBRequest = nullptr;
</del><ins>+ if (m_currentOpenDBRequest) {
+ m_currentOpenDBRequest->notifyDidDeleteDatabase(*m_mostRecentDeletedDatabaseInfo);
+ m_currentOpenDBRequest = nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> m_deleteBackingStoreInProgress = false;
</span><span class="cx">
</span><del>- if (m_closePendingDatabaseConnections.isEmpty()) {
- if (m_pendingOpenDBRequests.isEmpty())
- m_server.closeUniqueIDBDatabase(*this);
- else
- invokeOperationAndTransactionTimer();
</del><ins>+ if (m_closePendingDatabaseConnections.isEmpty() && m_pendingOpenDBRequests.isEmpty()) {
+ m_server.closeUniqueIDBDatabase(*this);
+ return;
</ins><span class="cx"> }
</span><ins>+
+ invokeOperationAndTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::handleDatabaseOperations()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations - There are %zu pending", m_pendingOpenDBRequests.size());
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations - There are %u pending", m_pendingOpenDBRequests.size());
</ins><span class="cx">
</span><ins>+ if (m_deleteBackingStoreInProgress)
+ return;
+
</ins><span class="cx"> if (m_versionChangeDatabaseConnection || m_versionChangeTransaction || m_currentOpenDBRequest) {
</span><span class="cx"> // We can't start any new open-database operations right now, but we might be able to start handling a delete operation.
</span><span class="cx"> if (!m_currentOpenDBRequest && !m_pendingOpenDBRequests.isEmpty() && m_pendingOpenDBRequests.first()->isDeleteRequest())
</span><span class="lines">@@ -297,13 +303,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_currentOpenDBRequest = m_pendingOpenDBRequests.takeFirst();
</span><del>- LOG(IndexedDB, "UniqueIDBDatabase::handleDatabaseOperations - Popped an operation, now there are %zu pending", m_pendingOpenDBRequests.size());
</del><ins>+ LOG(IndexedDB, "UniqueIDBDatabase::handleDatabaseOperations - Popped an operation, now there are %u pending", m_pendingOpenDBRequests.size());
</ins><span class="cx">
</span><span class="cx"> handleCurrentOperation();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::handleCurrentOperation()
</span><span class="cx"> {
</span><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::handleCurrentOperation");
+
</ins><span class="cx"> ASSERT(m_currentOpenDBRequest);
</span><span class="cx">
</span><span class="cx"> RefPtr<UniqueIDBDatabase> protector(this);
</span><span class="lines">@@ -367,7 +375,7 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDelete");
</span><span class="cx">
</span><del>- m_pendingOpenDBRequests.append(ServerOpenDBRequest::create(connection, requestData));
</del><ins>+ m_pendingOpenDBRequests.add(ServerOpenDBRequest::create(connection, requestData));
</ins><span class="cx"> handleDatabaseOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -467,6 +475,28 @@
</span><span class="cx"> notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connection.identifier());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::openDBRequestCancelled(const IDBResourceIdentifier& requestIdentifier)
+{
+ LOG(IndexedDB, "UniqueIDBDatabase::openDBRequestCancelled - %s", requestIdentifier.loggingString().utf8().data());
+
+ if (m_currentOpenDBRequest && m_currentOpenDBRequest->requestData().requestIdentifier() == requestIdentifier)
+ m_currentOpenDBRequest = nullptr;
+
+ if (m_versionChangeDatabaseConnection && m_versionChangeDatabaseConnection->openRequestIdentifier() == requestIdentifier) {
+ ASSERT(!m_versionChangeTransaction || m_versionChangeTransaction->databaseConnection().openRequestIdentifier() == requestIdentifier);
+ ASSERT(!m_versionChangeTransaction || &m_versionChangeTransaction->databaseConnection() == m_versionChangeDatabaseConnection);
+
+ connectionClosedFromClient(*m_versionChangeDatabaseConnection);
+ }
+
+ for (auto& request : m_pendingOpenDBRequests) {
+ if (request->requestData().requestIdentifier() == requestIdentifier) {
+ m_pendingOpenDBRequests.remove(request);
+ return;
+ }
+ }
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::addOpenDatabaseConnection(Ref<UniqueIDBDatabaseConnection>&& connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_openDatabaseConnections.contains(&connection.get()));
</span><span class="lines">@@ -998,13 +1028,19 @@
</span><span class="cx"> void UniqueIDBDatabase::commitTransaction(UniqueIDBDatabaseTransaction& transaction, ErrorCallback callback)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::commitTransaction");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::commitTransaction - %s", transaction.info().identifier().loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> ASSERT(&transaction.databaseConnection().database() == this);
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = storeCallback(callback);
</span><span class="cx">
</span><span class="cx"> if (!prepareToFinishTransaction(transaction)) {
</span><ins>+ if (!m_openDatabaseConnections.contains(&transaction.databaseConnection())) {
+ // This database connection is closing or has already closed, so there is no point in messaging back to it about the commit failing.
+ forgetErrorCallback(callbackID);
+ return;
+ }
+
</ins><span class="cx"> performErrorCallback(callbackID, { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to commit transaction that is already finishing") });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1015,7 +1051,7 @@
</span><span class="cx"> void UniqueIDBDatabase::performCommitTransaction(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><del>- LOG(IndexedDB, "(db) UniqueIDBDatabase::performCommitTransaction");
</del><ins>+ LOG(IndexedDB, "(db) UniqueIDBDatabase::performCommitTransaction - %s", transactionIdentifier.loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> IDBError error = m_backingStore->commitTransaction(transactionIdentifier);
</span><span class="cx"> m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &UniqueIDBDatabase::didPerformCommitTransaction, callbackIdentifier, error, transactionIdentifier));
</span><span class="lines">@@ -1024,7 +1060,7 @@
</span><span class="cx"> void UniqueIDBDatabase::didPerformCommitTransaction(uint64_t callbackIdentifier, const IDBError& error, const IDBResourceIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformCommitTransaction");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformCommitTransaction - %s", transactionIdentifier.loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> performErrorCallback(callbackIdentifier, error);
</span><span class="cx">
</span><span class="lines">@@ -1034,13 +1070,19 @@
</span><span class="cx"> void UniqueIDBDatabase::abortTransaction(UniqueIDBDatabaseTransaction& transaction, ErrorCallback callback)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::abortTransaction");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::abortTransaction - %s", transaction.info().identifier().loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> ASSERT(&transaction.databaseConnection().database() == this);
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = storeCallback(callback);
</span><span class="cx">
</span><span class="cx"> if (!prepareToFinishTransaction(transaction)) {
</span><ins>+ if (!m_openDatabaseConnections.contains(&transaction.databaseConnection())) {
+ // This database connection is closing or has already closed, so there is no point in messaging back to it about the abort failing.
+ forgetErrorCallback(callbackID);
+ return;
+ }
+
</ins><span class="cx"> performErrorCallback(callbackID, { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to abort transaction that is already finishing") });
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1048,13 +1090,13 @@
</span><span class="cx"> m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performAbortTransaction, callbackID, transaction.info().identifier()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::didFinishHandlingVersionChange(UniqueIDBDatabaseTransaction& transaction)
</del><ins>+void UniqueIDBDatabase::didFinishHandlingVersionChange(UniqueIDBDatabaseConnection& connection, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::didFinishHandlingVersionChange");
</span><span class="cx">
</span><del>- ASSERT(m_versionChangeTransaction);
- ASSERT_UNUSED(transaction, m_versionChangeTransaction == &transaction);
</del><ins>+ ASSERT_UNUSED(transactionIdentifier, !m_versionChangeTransaction || m_versionChangeTransaction->info().identifier() == transactionIdentifier);
+ ASSERT_UNUSED(connection, !m_versionChangeDatabaseConnection || m_versionChangeDatabaseConnection.get() == &connection);
</ins><span class="cx">
</span><span class="cx"> m_versionChangeTransaction = nullptr;
</span><span class="cx"> m_versionChangeDatabaseConnection = nullptr;
</span><span class="lines">@@ -1065,7 +1107,7 @@
</span><span class="cx"> void UniqueIDBDatabase::performAbortTransaction(uint64_t callbackIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><del>- LOG(IndexedDB, "(db) UniqueIDBDatabase::performAbortTransaction");
</del><ins>+ LOG(IndexedDB, "(db) UniqueIDBDatabase::performAbortTransaction - %s", transactionIdentifier.loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> IDBError error = m_backingStore->abortTransaction(transactionIdentifier);
</span><span class="cx"> m_server.postDatabaseTaskReply(createCrossThreadTask(*this, &UniqueIDBDatabase::didPerformAbortTransaction, callbackIdentifier, error, transactionIdentifier));
</span><span class="lines">@@ -1074,7 +1116,7 @@
</span><span class="cx"> void UniqueIDBDatabase::didPerformAbortTransaction(uint64_t callbackIdentifier, const IDBError& error, const IDBResourceIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformAbortTransaction");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformAbortTransaction - %s", transactionIdentifier.loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> auto transaction = m_finishingTransactions.take(transactionIdentifier);
</span><span class="cx"> ASSERT(transaction);
</span><span class="lines">@@ -1100,13 +1142,27 @@
</span><span class="cx"> void UniqueIDBDatabase::connectionClosedFromClient(UniqueIDBDatabaseConnection& connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::connectionClosedFromClient");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::connectionClosedFromClient - %s (%" PRIu64 ")", connection.openRequestIdentifier().loggingString().utf8().data(), connection.identifier());
</ins><span class="cx">
</span><del>- if (m_versionChangeDatabaseConnection == &connection)
</del><ins>+ Ref<UniqueIDBDatabaseConnection> protectedConnection(connection);
+ m_openDatabaseConnections.remove(&connection);
+
+ if (m_versionChangeDatabaseConnection == &connection) {
+ if (m_versionChangeTransaction) {
+ m_closePendingDatabaseConnections.add(WTFMove(m_versionChangeDatabaseConnection));
+
+ auto transactionIdentifier = m_versionChangeTransaction->info().identifier();
+ if (m_inProgressTransactions.contains(transactionIdentifier)) {
+ ASSERT(!m_finishingTransactions.contains(transactionIdentifier));
+ connection.abortTransactionWithoutCallback(*m_versionChangeTransaction);
+ }
+
+ return;
+ }
+
</ins><span class="cx"> m_versionChangeDatabaseConnection = nullptr;
</span><ins>+ }
</ins><span class="cx">
</span><del>- ASSERT(m_openDatabaseConnections.contains(&connection));
-
</del><span class="cx"> Deque<RefPtr<UniqueIDBDatabaseTransaction>> pendingTransactions;
</span><span class="cx"> while (!m_pendingTransactions.isEmpty()) {
</span><span class="cx"> auto transaction = m_pendingTransactions.takeFirst();
</span><span class="lines">@@ -1117,14 +1173,11 @@
</span><span class="cx"> if (!pendingTransactions.isEmpty())
</span><span class="cx"> m_pendingTransactions.swap(pendingTransactions);
</span><span class="cx">
</span><del>- RefPtr<UniqueIDBDatabaseConnection> refConnection(&connection);
- m_openDatabaseConnections.remove(&connection);
-
</del><span class="cx"> if (m_currentOpenDBRequest)
</span><span class="cx"> notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(connection.identifier());
</span><span class="cx">
</span><span class="cx"> if (connection.hasNonFinishedTransactions()) {
</span><del>- m_closePendingDatabaseConnections.add(WTFMove(refConnection));
</del><ins>+ m_closePendingDatabaseConnections.add(WTFMove(protectedConnection));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1322,6 +1375,9 @@
</span><span class="cx"> if (!transaction->databaseConnection().hasNonFinishedTransactions())
</span><span class="cx"> m_closePendingDatabaseConnections.remove(&transaction->databaseConnection());
</span><span class="cx">
</span><ins>+ if (m_versionChangeTransaction == transaction)
+ m_versionChangeTransaction = nullptr;
+
</ins><span class="cx"> // It's possible that this database had its backing store deleted but there were a few outstanding asynchronous operations.
</span><span class="cx"> // If this transaction completing was the last of those operations, we can finally delete this UniqueIDBDatabase.
</span><span class="cx"> if (m_closePendingDatabaseConnections.isEmpty() && m_pendingOpenDBRequests.isEmpty() && !m_databaseInfo) {
</span><span class="lines">@@ -1361,6 +1417,12 @@
</span><span class="cx"> callback(error, count);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::forgetErrorCallback(uint64_t callbackIdentifier)
+{
+ ASSERT(m_errorCallbacks.contains(callbackIdentifier));
+ m_errorCallbacks.remove(callbackIdentifier);
+}
+
</ins><span class="cx"> } // namespace IDBServer
</span><span class="cx"> } // namespace WebCore
</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 (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -96,10 +96,11 @@
</span><span class="cx"> void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count, GetResultCallback);
</span><span class="cx"> void commitTransaction(UniqueIDBDatabaseTransaction&, ErrorCallback);
</span><span class="cx"> void abortTransaction(UniqueIDBDatabaseTransaction&, ErrorCallback);
</span><del>- void didFinishHandlingVersionChange(UniqueIDBDatabaseTransaction&);
</del><ins>+ void didFinishHandlingVersionChange(UniqueIDBDatabaseConnection&, const IDBResourceIdentifier& transactionIdentifier);
</ins><span class="cx"> void transactionDestroyed(UniqueIDBDatabaseTransaction&);
</span><span class="cx"> void connectionClosedFromClient(UniqueIDBDatabaseConnection&);
</span><span class="cx"> void didFireVersionChangeEvent(UniqueIDBDatabaseConnection&, const IDBResourceIdentifier& requestIdentifier);
</span><ins>+ void openDBRequestCancelled(const IDBResourceIdentifier& requestIdentifier);
</ins><span class="cx">
</span><span class="cx"> void enqueueTransaction(Ref<UniqueIDBDatabaseTransaction>&&);
</span><span class="cx">
</span><span class="lines">@@ -174,6 +175,8 @@
</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><ins>+ void forgetErrorCallback(uint64_t callbackIdentifier);
+
</ins><span class="cx"> bool hasAnyPendingCallbacks() const;
</span><span class="cx"> bool isCurrentlyInUse() const;
</span><span class="cx"> bool hasUnfinishedTransactions() const;
</span><span class="lines">@@ -187,7 +190,7 @@
</span><span class="cx"> IDBServer& m_server;
</span><span class="cx"> IDBDatabaseIdentifier m_identifier;
</span><span class="cx">
</span><del>- Deque<Ref<ServerOpenDBRequest>> m_pendingOpenDBRequests;
</del><ins>+ ListHashSet<RefPtr<ServerOpenDBRequest>> m_pendingOpenDBRequests;
</ins><span class="cx"> RefPtr<ServerOpenDBRequest> m_currentOpenDBRequest;
</span><span class="cx">
</span><span class="cx"> ListHashSet<RefPtr<UniqueIDBDatabaseConnection>> m_openDatabaseConnections;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "IDBServer.h"
</span><span class="cx"> #include "IDBTransactionInfo.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "ServerOpenDBRequest.h"
</ins><span class="cx"> #include "UniqueIDBDatabase.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -70,9 +71,14 @@
</span><span class="cx"> void UniqueIDBDatabaseConnection::abortTransactionWithoutCallback(UniqueIDBDatabaseTransaction& transaction)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_transactionMap.contains(transaction.info().identifier()));
</span><del>- auto takenTransaction = m_transactionMap.take(transaction.info().identifier());
</del><span class="cx">
</span><del>- m_database.abortTransaction(*takenTransaction, [](const IDBError&) { });
</del><ins>+ const auto& transactionIdentifier = transaction.info().identifier();
+ RefPtr<UniqueIDBDatabaseConnection> protector(this);
+
+ m_database.abortTransaction(transaction, [this, protector, transactionIdentifier](const IDBError&) {
+ ASSERT(m_transactionMap.contains(transactionIdentifier));
+ m_transactionMap.remove(transactionIdentifier);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabaseConnection::connectionClosedFromClient()
</span><span class="lines">@@ -90,6 +96,13 @@
</span><span class="cx"> m_database.didFireVersionChangeEvent(*this, requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabaseConnection::didFinishHandlingVersionChange(const IDBResourceIdentifier& transactionIdentifier)
+{
+ LOG(IndexedDB, "UniqueIDBDatabaseConnection::didFinishHandlingVersionChange - %s - %" PRIu64, transactionIdentifier.loggingString().utf8().data(), m_identifier);
+
+ m_database.didFinishHandlingVersionChange(*this, transactionIdentifier);
+}
+
</ins><span class="cx"> void UniqueIDBDatabaseConnection::fireVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_closePending);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef UniqueIDBDatabaseConnection_h
-#define UniqueIDBDatabaseConnection_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="lines">@@ -74,6 +73,7 @@
</span><span class="cx"> void didCreateIndex(const IDBResultData&);
</span><span class="cx"> void didDeleteIndex(const IDBResultData&);
</span><span class="cx"> void didFireVersionChangeEvent(const IDBResourceIdentifier& requestIdentifier);
</span><ins>+ void didFinishHandlingVersionChange(const IDBResourceIdentifier& transactionIdentifier);
</ins><span class="cx">
</span><span class="cx"> void abortTransactionWithoutCallback(UniqueIDBDatabaseTransaction&);
</span><span class="cx">
</span><span class="lines">@@ -94,4 +94,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><del>-#endif // UniqueIDBDatabaseConnection_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -316,14 +316,6 @@
</span><span class="cx"> m_databaseConnection->connectionToClient().didStartTransaction(m_transactionInfo.identifier(), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabaseTransaction::didFinishHandlingVersionChange()
-{
- LOG(IndexedDB, "UniqueIDBDatabaseTransaction::didFinishHandlingVersionChange");
- ASSERT(isVersionChange());
-
- m_databaseConnection->database().didFinishHandlingVersionChange(*this);
-}
-
</del><span class="cx"> } // namespace IDBServer
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef UniqueIDBDatabaseTransaction_h
-#define UniqueIDBDatabaseTransaction_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="lines">@@ -80,7 +79,6 @@
</span><span class="cx"> void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count);
</span><span class="cx">
</span><span class="cx"> void didActivateInBackingStore(const IDBError&);
</span><del>- void didFinishHandlingVersionChange();
</del><span class="cx">
</span><span class="cx"> const Vector<uint64_t>& objectStoreIdentifiers();
</span><span class="cx">
</span><span class="lines">@@ -99,4 +97,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><del>-#endif // UniqueIDBDatabaseTransaction_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -241,11 +241,11 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InProcessIDBServer::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</del><ins>+void InProcessIDBServer::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InProcessIDBServer> self(this);
</span><del>- RunLoop::current().dispatch([this, self, transactionIdentifier] {
- m_server->didFinishHandlingVersionChangeTransaction(transactionIdentifier);
</del><ins>+ RunLoop::current().dispatch([this, self, databaseConnectionIdentifier, transactionIdentifier] {
+ m_server->didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -399,6 +399,14 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InProcessIDBServer::openDBRequestCancelled(const IDBRequestData& requestData)
+{
+ RefPtr<InProcessIDBServer> self(this);
+ RunLoop::current().dispatch([this, self, requestData] {
+ m_server->openDBRequestCancelled(requestData);
+ });
+}
+
</ins><span class="cx"> void InProcessIDBServer::getAllDatabaseNames(const SecurityOriginData& mainFrameOrigin, const SecurityOriginData& openingOrigin, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InProcessIDBServer> protector(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef InProcessIDBServer_h
-#define InProcessIDBServer_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="lines">@@ -59,7 +58,7 @@
</span><span class="cx"> void openDatabase(const IDBRequestData&) final;
</span><span class="cx"> void abortTransaction(const IDBResourceIdentifier&) final;
</span><span class="cx"> void commitTransaction(const IDBResourceIdentifier&) final;
</span><del>- void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&) final;
</del><ins>+ void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier&) final;
</ins><span class="cx"> void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&) final;
</span><span class="cx"> void deleteObjectStore(const IDBRequestData&, const String& objectStoreName) final;
</span><span class="cx"> void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier) final;
</span><span class="lines">@@ -75,6 +74,7 @@
</span><span class="cx"> void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) final;
</span><span class="cx"> void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) final;
</span><span class="cx"> void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier) final;
</span><ins>+ void openDBRequestCancelled(const IDBRequestData&) final;
</ins><span class="cx"> void getAllDatabaseNames(const SecurityOriginData& mainFrameOrigin, const SecurityOriginData& openingOrigin, uint64_t callbackID) final;
</span><span class="cx">
</span><span class="cx"> // IDBConnectionToClient
</span><span class="lines">@@ -117,4 +117,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><del>-#endif // InProcessIDBServer_h
</del></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-11 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: IDBOpenDBRequests that are stop()'ed don't notify the IDBServer of that fact.
+ https://bugs.webkit.org/show_bug.cgi?id=157448
+
+ Reviewed by Alex Christensen.
+
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ (WebKit::WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction):
+ (WebKit::WebIDBConnectionToClient::openDBRequestCancelled):
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
+
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
+ (WebKit::WebIDBConnectionToServer::didFinishHandlingVersionChangeTransaction):
+ (WebKit::WebIDBConnectionToServer::openDBRequestCancelled):
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+
</ins><span class="cx"> 2016-05-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a typo in r200330
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -199,9 +199,9 @@
</span><span class="cx"> DatabaseProcess::singleton().idbServer().commitTransaction(transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</del><ins>+void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><del>- DatabaseProcess::singleton().idbServer().didFinishHandlingVersionChangeTransaction(transactionIdentifier);
</del><ins>+ DatabaseProcess::singleton().idbServer().didFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIDBConnectionToClient::createObjectStore(const IDBRequestData& request, const IDBObjectStoreInfo& info)
</span><span class="lines">@@ -289,6 +289,11 @@
</span><span class="cx"> DatabaseProcess::singleton().idbServer().didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBConnectionToClient::openDBRequestCancelled(const IDBRequestData& requestData)
+{
+ DatabaseProcess::singleton().idbServer().openDBRequestCancelled(requestData);
+}
+
</ins><span class="cx"> void WebIDBConnectionToClient::getAllDatabaseNames(uint64_t serverConnectionIdentifier, const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> DatabaseProcess::singleton().idbServer().getAllDatabaseNames(serverConnectionIdentifier, topOrigin, openingOrigin, callbackID);
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> void openDatabase(const WebCore::IDBRequestData&);
</span><span class="cx"> void abortTransaction(const WebCore::IDBResourceIdentifier&);
</span><span class="cx"> void commitTransaction(const WebCore::IDBResourceIdentifier&);
</span><del>- void didFinishHandlingVersionChangeTransaction(const WebCore::IDBResourceIdentifier&);
</del><ins>+ void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier&);
</ins><span class="cx"> void createObjectStore(const WebCore::IDBRequestData&, const WebCore::IDBObjectStoreInfo&);
</span><span class="cx"> void deleteObjectStore(const WebCore::IDBRequestData&, const String& objectStoreName);
</span><span class="cx"> void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier);
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
</span><span class="cx"> void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& transactionIdentifier);
</span><span class="cx"> void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier);
</span><ins>+ void openDBRequestCancelled(const WebCore::IDBRequestData&);
</ins><span class="cx">
</span><span class="cx"> void getAllDatabaseNames(uint64_t serverConnectionIdentifier, const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> OpenDatabase(WebCore::IDBRequestData requestData);
</span><span class="cx"> AbortTransaction(WebCore::IDBResourceIdentifier transactionIdentifier);
</span><span class="cx"> CommitTransaction(WebCore::IDBResourceIdentifier transactionIdentifier);
</span><del>- DidFinishHandlingVersionChangeTransaction(WebCore::IDBResourceIdentifier transactionIdentifier);
</del><ins>+ DidFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, WebCore::IDBResourceIdentifier transactionIdentifier);
</ins><span class="cx"> CreateObjectStore(WebCore::IDBRequestData requestData, WebCore::IDBObjectStoreInfo info);
</span><span class="cx"> DeleteObjectStore(WebCore::IDBRequestData requestData, String objectStoreName);
</span><span class="cx"> ClearObjectStore(WebCore::IDBRequestData requestData, uint64_t objectStoreIdentifier);
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> DatabaseConnectionClosed(uint64_t databaseConnectionIdentifier);
</span><span class="cx"> AbortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, WebCore::IDBResourceIdentifier transactionIdentifier);
</span><span class="cx"> DidFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, WebCore::IDBResourceIdentifier requestIdentifier);
</span><ins>+ OpenDBRequestCancelled(WebCore::IDBRequestData requestData);
</ins><span class="cx">
</span><span class="cx"> GetAllDatabaseNames(uint64_t serverConnectionIdentifier, struct WebCore::SecurityOriginData topOrigin, struct WebCore::SecurityOriginData openingOrigin, uint64_t callbackID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> send(Messages::WebIDBConnectionToClient::CommitTransaction(transactionIdentifier));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToServer::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</del><ins>+void WebIDBConnectionToServer::didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><del>- send(Messages::WebIDBConnectionToClient::DidFinishHandlingVersionChangeTransaction(transactionIdentifier));
</del><ins>+ send(Messages::WebIDBConnectionToClient::DidFinishHandlingVersionChangeTransaction(databaseConnectionIdentifier, transactionIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIDBConnectionToServer::createObjectStore(const IDBRequestData& requestData, const IDBObjectStoreInfo& info)
</span><span class="lines">@@ -181,6 +181,11 @@
</span><span class="cx"> send(Messages::WebIDBConnectionToClient::DidFireVersionChangeEvent(databaseConnectionIdentifier, requestIdentifier));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBConnectionToServer::openDBRequestCancelled(const IDBRequestData& requestData)
+{
+ send(Messages::WebIDBConnectionToClient::OpenDBRequestCancelled(requestData));
+}
+
</ins><span class="cx"> void WebIDBConnectionToServer::getAllDatabaseNames(const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> send(Messages::WebIDBConnectionToClient::GetAllDatabaseNames(m_identifier, topOrigin, openingOrigin, callbackID));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h (200694 => 200695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-05-11 18:33:31 UTC (rev 200694)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-05-11 18:42:03 UTC (rev 200695)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> void openDatabase(const WebCore::IDBRequestData&) final;
</span><span class="cx"> void abortTransaction(const WebCore::IDBResourceIdentifier&) final;
</span><span class="cx"> void commitTransaction(const WebCore::IDBResourceIdentifier&) final;
</span><del>- void didFinishHandlingVersionChangeTransaction(const WebCore::IDBResourceIdentifier&) final;
</del><ins>+ void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier&) final;
</ins><span class="cx"> void createObjectStore(const WebCore::IDBRequestData&, const WebCore::IDBObjectStoreInfo&) final;
</span><span class="cx"> void deleteObjectStore(const WebCore::IDBRequestData&, const String& objectStoreName) final;
</span><span class="cx"> void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier) final;
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) final;
</span><span class="cx"> void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& transactionIdentifier) final;
</span><span class="cx"> void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier) final;
</span><ins>+ void openDBRequestCancelled(const WebCore::IDBRequestData&) final;
+
</ins><span class="cx"> void getAllDatabaseNames(const WebCore::SecurityOriginData& topOrigin, const WebCore::SecurityOriginData& openingOrigin, uint64_t callbackID) final;
</span><span class="cx">
</span><span class="cx"> void ref() override { RefCounted<WebIDBConnectionToServer>::ref(); }
</span></span></pre>
</div>
</div>
</body>
</html>