<!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>[208609] 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/208609">208609</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 13:57:42 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>IndexedDB 2.0: "close pending flag" and firing blocked events all need fixing.
https://bugs.webkit.org/show_bug.cgi?id=164641
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
* web-platform-tests/IndexedDB/idbobjectstore-rename-store-expected.txt:
Source/WebCore:
No new tests (Covered by at least 3 existing tests).
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::close):
(WebCore::IDBDatabase::maybeCloseInServer):
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::databaseConnectionPendingClose):
* Modules/indexeddb/client/IDBConnectionProxy.h:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::databaseConnectionPendingClose):
* Modules/indexeddb/client/IDBConnectionToServer.h:
* Modules/indexeddb/client/IDBConnectionToServerDelegate.h:
* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::databaseConnectionPendingClose):
* Modules/indexeddb/server/IDBServer.h:
* Modules/indexeddb/server/ServerOpenDBRequest.cpp:
(WebCore::IDBServer::ServerOpenDBRequest::maybeNotifyRequestBlocked):
(WebCore::IDBServer::ServerOpenDBRequest::notifyRequestBlocked): Deleted.
* Modules/indexeddb/server/ServerOpenDBRequest.h:
(WebCore::IDBServer::ServerOpenDBRequest::hasNotifiedBlocked): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::allConnectionsAreClosedOrClosing):
(WebCore::IDBServer::UniqueIDBDatabase::maybeNotifyConnectionsOfVersionChange):
(WebCore::IDBServer::UniqueIDBDatabase::notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent):
* Modules/indexeddb/server/UniqueIDBDatabase.h:
* Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionPendingCloseFromClient):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionClosedFromClient):
(WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionIsClosing):
* Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
* Modules/indexeddb/shared/InProcessIDBServer.cpp:
(WebCore::InProcessIDBServer::databaseConnectionPendingClose):
* Modules/indexeddb/shared/InProcessIDBServer.h:
Source/WebKit2:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
(WebKit::WebIDBConnectionToClient::databaseConnectionPendingClose):
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
(WebKit::WebIDBConnectionToServer::databaseConnectionPendingClose):
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbobjectstorerenamestoreexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore-rename-store-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp</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="#trunkSourceWebCoreModulesindexeddbserverServerOpenDBRequestcpp">trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverServerOpenDBRequesth">trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.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="#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="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-11-11 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: "close pending flag" and firing blocked events all need fixing.
+ https://bugs.webkit.org/show_bug.cgi?id=164641
+
+ Reviewed by Alex Christensen.
+
+ * web-platform-tests/IndexedDB/idbobjectstore-rename-store-expected.txt:
+
</ins><span class="cx"> 2016-11-10 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0 Support the IDBDatabase.onclose event.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsIndexedDBidbobjectstorerenamestoreexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore-rename-store-expected.txt (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore-rename-store-expected.txt 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbobjectstore-rename-store-expected.txt 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> PASS IndexedDB object store rename in new transaction
</span><span class="cx"> PASS IndexedDB object store rename in the transaction where it is created
</span><span class="cx"> PASS IndexedDB object store rename covers index
</span><del>-FAIL IndexedDB object store rename covers key generator assert_equals: Renaming an object store should not change the state of its key generator expected 345680 but got 345679
</del><ins>+PASS IndexedDB object store rename covers key generator
</ins><span class="cx"> PASS IndexedDB object store rename to the same name succeeds
</span><span class="cx"> PASS IndexedDB object store rename to the name of a deleted store succeeds
</span><span class="cx"> PASS IndexedDB object store swapping via renames succeeds
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2016-11-11 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: "close pending flag" and firing blocked events all need fixing.
+ https://bugs.webkit.org/show_bug.cgi?id=164641
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Covered by at least 3 existing tests).
+
+ * Modules/indexeddb/IDBDatabase.cpp:
+ (WebCore::IDBDatabase::close):
+ (WebCore::IDBDatabase::maybeCloseInServer):
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::databaseConnectionPendingClose):
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::databaseConnectionPendingClose):
+ * Modules/indexeddb/client/IDBConnectionToServer.h:
+ * Modules/indexeddb/client/IDBConnectionToServerDelegate.h:
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::databaseConnectionPendingClose):
+ * Modules/indexeddb/server/IDBServer.h:
+
+ * Modules/indexeddb/server/ServerOpenDBRequest.cpp:
+ (WebCore::IDBServer::ServerOpenDBRequest::maybeNotifyRequestBlocked):
+ (WebCore::IDBServer::ServerOpenDBRequest::notifyRequestBlocked): Deleted.
+ * Modules/indexeddb/server/ServerOpenDBRequest.h:
+ (WebCore::IDBServer::ServerOpenDBRequest::hasNotifiedBlocked): Deleted.
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::allConnectionsAreClosedOrClosing):
+ (WebCore::IDBServer::UniqueIDBDatabase::maybeNotifyConnectionsOfVersionChange):
+ (WebCore::IDBServer::UniqueIDBDatabase::notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent):
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionPendingCloseFromClient):
+ (WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionClosedFromClient):
+ (WebCore::IDBServer::UniqueIDBDatabaseConnection::connectionIsClosing):
+ * Modules/indexeddb/server/UniqueIDBDatabaseConnection.h:
+
+ * Modules/indexeddb/shared/InProcessIDBServer.cpp:
+ (WebCore::InProcessIDBServer::databaseConnectionPendingClose):
+ * Modules/indexeddb/shared/InProcessIDBServer.h:
+
</ins><span class="cx"> 2016-11-11 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix time unit parsing
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -237,7 +237,11 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="cx">
</span><del>- m_closePending = true;
</del><ins>+ if (!m_closePending) {
+ m_closePending = true;
+ m_connectionProxy->databaseConnectionPendingClose(*this);
+ }
+
</ins><span class="cx"> maybeCloseInServer();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,7 +291,7 @@
</span><span class="cx"> // 3.3.9 Database closing steps
</span><span class="cx"> // Wait for all transactions created using this connection to complete.
</span><span class="cx"> // Once they are complete, this connection is closed.
</span><del>- if (!m_activeTransactions.isEmpty())
</del><ins>+ if (!m_activeTransactions.isEmpty() || !m_committingTransactions.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_closedInServer = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -384,6 +384,11 @@
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::didFinishHandlingVersionChangeTransaction, databaseConnectionIdentifier, transaction.info().identifier());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionProxy::databaseConnectionPendingClose(IDBDatabase& database)
+{
+ callConnectionOnMainThread(&IDBConnectionToServer::databaseConnectionPendingClose, database.databaseConnectionIdentifier());
+}
+
</ins><span class="cx"> void IDBConnectionProxy::databaseConnectionClosed(IDBDatabase& database)
</span><span class="cx"> {
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::databaseConnectionClosed, database.databaseConnectionIdentifier());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&);
</span><span class="cx">
</span><span class="cx"> void didFinishHandlingVersionChangeTransaction(uint64_t databaseConnectionIdentifier, IDBTransaction&);
</span><ins>+ void databaseConnectionPendingClose(IDBDatabase&);
</ins><span class="cx"> void databaseConnectionClosed(IDBDatabase&);
</span><span class="cx">
</span><span class="cx"> void didCloseFromServer(uint64_t databaseConnectionIdentifier, const IDBError&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -399,6 +399,14 @@
</span><span class="cx"> m_delegate->openDBRequestCancelled(requestData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBConnectionToServer::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
+{
+ LOG(IndexedDB, "IDBConnectionToServer::databaseConnectionPendingClose");
+ ASSERT(isMainThread());
+
+ m_delegate->databaseConnectionPendingClose(databaseConnectionIdentifier);
+}
+
</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 (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx">
</span><span class="cx"> void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
</span><span class="cx">
</span><ins>+ void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier);
</ins><span class="cx"> void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
</span><span class="cx">
</span><span class="cx"> // To be used when an IDBOpenDBRequest gets a new database connection, optionally with a
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> virtual void iterateCursor(const IDBRequestData&, const IDBIterateCursorData&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&) = 0;
</span><ins>+ virtual void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier) = 0;
</ins><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></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -385,6 +385,17 @@
</span><span class="cx"> connection->didFinishHandlingVersionChange(transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBServer::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
+{
+ LOG(IndexedDB, "IDBServer::databaseConnectionPendingClose - %" PRIu64, databaseConnectionIdentifier);
+
+ auto databaseConnection = m_databaseConnections.get(databaseConnectionIdentifier);
+ if (!databaseConnection)
+ return;
+
+ databaseConnection->connectionPendingCloseFromClient();
+}
+
</ins><span class="cx"> void IDBServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBServer::databaseConnectionClosed - %" PRIu64, databaseConnectionIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> WEBCORE_EXPORT void iterateCursor(const IDBRequestData&, const IDBIterateCursorData&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
</span><ins>+ WEBCORE_EXPORT void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier);
</ins><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></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverServerOpenDBRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -55,9 +55,10 @@
</span><span class="cx"> return m_requestData.isDeleteRequest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ServerOpenDBRequest::notifyRequestBlocked(uint64_t currentVersion)
</del><ins>+void ServerOpenDBRequest::maybeNotifyRequestBlocked(uint64_t currentVersion)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_notifiedBlocked);
</del><ins>+ if (m_notifiedBlocked)
+ return;
</ins><span class="cx">
</span><span class="cx"> uint64_t requestedVersion = isOpenRequest() ? m_requestData.requestedVersion() : 0;
</span><span class="cx"> m_connection.notifyOpenDBRequestBlocked(m_requestData.requestIdentifier(), currentVersion, requestedVersion);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverServerOpenDBRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/ServerOpenDBRequest.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx"> bool isOpenRequest() const;
</span><span class="cx"> bool isDeleteRequest() const;
</span><span class="cx">
</span><del>- bool hasNotifiedBlocked() const { return m_notifiedBlocked; }
- void notifyRequestBlocked(uint64_t currentVersion);
</del><ins>+ void maybeNotifyRequestBlocked(uint64_t currentVersion);
</ins><span class="cx"> void notifyDidDeleteDatabase(const IDBDatabaseInfo&);
</span><span class="cx">
</span><span class="cx"> uint64_t versionChangeID() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -366,6 +366,16 @@
</span><span class="cx"> return !m_openDatabaseConnections.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabase::allConnectionsAreClosedOrClosing() const
+{
+ for (auto& connection : m_openDatabaseConnections) {
+ if (!connection->connectionIsClosing())
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> static uint64_t generateUniqueCallbackIdentifier()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -504,7 +514,10 @@
</span><span class="cx"> connectionIdentifiers.add(connection->identifier());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_currentOpenDBRequest->notifiedConnectionsOfVersionChange(WTFMove(connectionIdentifiers));
</del><ins>+ if (!connectionIdentifiers.isEmpty())
+ m_currentOpenDBRequest->notifiedConnectionsOfVersionChange(WTFMove(connectionIdentifiers));
+ else
+ m_currentOpenDBRequest->maybeNotifyRequestBlocked(m_databaseInfo->version());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::notifyCurrentRequestConnectionClosedOrFiredVersionChangeEvent(uint64_t connectionIdentifier)
</span><span class="lines">@@ -518,17 +531,14 @@
</span><span class="cx"> if (m_currentOpenDBRequest->hasConnectionsPendingVersionChangeEvent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!hasAnyOpenConnections()) {
</del><ins>+ if (!hasAnyOpenConnections() || allConnectionsAreClosedOrClosing()) {
</ins><span class="cx"> invokeOperationAndTransactionTimer();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_currentOpenDBRequest->hasNotifiedBlocked())
- return;
-
</del><span class="cx"> // Since all open connections have fired their version change events but not all of them have closed,
</span><span class="cx"> // this request is officially blocked.
</span><del>- m_currentOpenDBRequest->notifyRequestBlocked(m_databaseInfo->version());
</del><ins>+ m_currentOpenDBRequest->maybeNotifyRequestBlocked(m_databaseInfo->version());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didFireVersionChangeEvent(UniqueIDBDatabaseConnection& connection, const IDBResourceIdentifier& requestIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> void performCurrentDeleteOperation();
</span><span class="cx"> void addOpenDatabaseConnection(Ref<UniqueIDBDatabaseConnection>&&);
</span><span class="cx"> bool hasAnyOpenConnections() const;
</span><ins>+ bool allConnectionsAreClosedOrClosing() const;
</ins><span class="cx">
</span><span class="cx"> void startVersionChangeTransaction();
</span><span class="cx"> void maybeNotifyConnectionsOfVersionChange();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -83,11 +83,17 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabaseConnection::connectionPendingCloseFromClient()
+{
+ LOG(IndexedDB, "UniqueIDBDatabaseConnection::connectionPendingCloseFromClient - %s - %" PRIu64, m_openRequestIdentifier.loggingString().utf8().data(), m_identifier);
+
+ m_closePending = true;
+}
+
</ins><span class="cx"> void UniqueIDBDatabaseConnection::connectionClosedFromClient()
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "UniqueIDBDatabaseConnection::connectionClosedFromClient - %s - %" PRIu64, m_openRequestIdentifier.loggingString().utf8().data(), m_identifier);
</span><span class="cx">
</span><del>- m_closePending = true;
</del><span class="cx"> m_database.connectionClosedFromClient(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -219,6 +225,11 @@
</span><span class="cx"> m_connectionToClient.didRenameIndex(resultData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabaseConnection::connectionIsClosing() const
+{
+ return m_closePending;
+}
+
</ins><span class="cx"> } // namespace IDBServer
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> UniqueIDBDatabase& database() { return m_database; }
</span><span class="cx"> IDBConnectionToClient& connectionToClient() { return m_connectionToClient; }
</span><span class="cx">
</span><ins>+ void connectionPendingCloseFromClient();
</ins><span class="cx"> void connectionClosedFromClient();
</span><span class="cx">
</span><span class="cx"> bool closePending() const { return m_closePending; }
</span><span class="lines">@@ -80,6 +81,8 @@
</span><span class="cx">
</span><span class="cx"> void abortTransactionWithoutCallback(UniqueIDBDatabaseTransaction&);
</span><span class="cx">
</span><ins>+ bool connectionIsClosing() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabaseConnection(UniqueIDBDatabase&, ServerOpenDBRequest&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -385,6 +385,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InProcessIDBServer::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
+{
+ RunLoop::current().dispatch([this, protectedThis = makeRef(*this), databaseConnectionIdentifier] {
+ m_server->databaseConnectionPendingClose(databaseConnectionIdentifier);
+ });
+}
+
</ins><span class="cx"> void InProcessIDBServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> RunLoop::current().dispatch([this, protectedThis = makeRef(*this), databaseConnectionIdentifier] {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> void openCursor(const IDBRequestData&, const IDBCursorInfo&) final;
</span><span class="cx"> void iterateCursor(const IDBRequestData&, const IDBIterateCursorData&) final;
</span><span class="cx"> void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&) final;
</span><ins>+ void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier) final;
</ins><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></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-11 Brady Eidson <beidson@apple.com>
+
+ IndexedDB 2.0: "close pending flag" and firing blocked events all need fixing.
+ https://bugs.webkit.org/show_bug.cgi?id=164641
+
+ Reviewed by Alex Christensen.
+
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ (WebKit::WebIDBConnectionToClient::databaseConnectionPendingClose):
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
+
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
+ (WebKit::WebIDBConnectionToServer::databaseConnectionPendingClose):
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+
</ins><span class="cx"> 2016-11-11 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] defer resolution of getUserMedia promise made in a background tab
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -331,6 +331,11 @@
</span><span class="cx"> DatabaseProcess::singleton().idbServer().establishTransaction(databaseConnectionIdentifier, info);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBConnectionToClient::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
+{
+ DatabaseProcess::singleton().idbServer().databaseConnectionPendingClose(databaseConnectionIdentifier);
+}
+
</ins><span class="cx"> void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> DatabaseProcess::singleton().idbServer().databaseConnectionClosed(databaseConnectionIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> void iterateCursor(const WebCore::IDBRequestData&, const WebCore::IDBIterateCursorData&);
</span><span class="cx">
</span><span class="cx"> void establishTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBTransactionInfo&);
</span><ins>+ void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier);
</ins><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></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> IterateCursor(WebCore::IDBRequestData requestData, struct WebCore::IDBIterateCursorData data);
</span><span class="cx">
</span><span class="cx"> EstablishTransaction(uint64_t databaseConnectionIdentifier, WebCore::IDBTransactionInfo info);
</span><ins>+ DatabaseConnectionPendingClose(uint64_t databaseConnectionIdentifier);
</ins><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></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -185,6 +185,11 @@
</span><span class="cx"> send(Messages::WebIDBConnectionToClient::EstablishTransaction(databaseConnectionIdentifier, info));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBConnectionToServer::databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier)
+{
+ send(Messages::WebIDBConnectionToClient::DatabaseConnectionPendingClose(databaseConnectionIdentifier));
+}
+
</ins><span class="cx"> void WebIDBConnectionToServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> send(Messages::WebIDBConnectionToClient::DatabaseConnectionClosed(databaseConnectionIdentifier));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h (208608 => 208609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-11-11 21:55:44 UTC (rev 208608)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-11-11 21:57:42 UTC (rev 208609)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> void openCursor(const WebCore::IDBRequestData&, const WebCore::IDBCursorInfo&) final;
</span><span class="cx"> void iterateCursor(const WebCore::IDBRequestData&, const WebCore::IDBIterateCursorData&) final;
</span><span class="cx"> void establishTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBTransactionInfo&) final;
</span><ins>+ void databaseConnectionPendingClose(uint64_t databaseConnectionIdentifier) final;
</ins><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></span></pre>
</div>
</div>
</body>
</html>