<!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>[191157] 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/191157">191157</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-15 17:34:38 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/191156">r191156</a>.
https://bugs.webkit.org/show_bug.cgi?id=150215
Introduced crashing test (Requested by bradee-oh on #webkit).
Reverted changeset:
"Modern IDB: Support IDBDatabase.close()."
https://bugs.webkit.org/show_bug.cgi?id=150150
http://trac.webkit.org/changeset/191156</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionsexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServerh">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
<li><a href="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/LayoutTests/ChangeLog 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r191156.
+ https://bugs.webkit.org/show_bug.cgi?id=150215
+
+ Introduced crashing test (Requested by bradee-oh on #webkit).
+
+ Reverted changeset:
+
+ "Modern IDB: Support IDBDatabase.close()."
+ https://bugs.webkit.org/show_bug.cgi?id=150150
+ http://trac.webkit.org/changeset/191156
+
</ins><span class="cx"> 2015-10-15 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Support IDBDatabase.close().
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -4,10 +4,6 @@
</span><span class="cx"> ALERT: Version change complete (firstPhase). Database version is now - 1
</span><span class="cx"> ALERT: [object IDBOpenDBRequest] (secondPhase)
</span><span class="cx"> ALERT: Successfully opened database at version 1 (secondPhase)
</span><del>-ALERT: [object IDBOpenDBRequest] (thirdPhase)
-ALERT: upgradeneeded (thirdPhase): old version - 1 new version - 2
-ALERT: [object IDBTransaction]
-ALERT: Version change complete (thirdPhase). Database version is now - 2
</del><span class="cx"> ALERT: Done
</span><span class="cx"> This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to make sure the IDBOpenDBRequests behave appropriately.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> request.transaction.oncomplete = function()
</span><span class="cx"> {
</span><span class="cx"> alert("Version change complete (firstPhase). Database version is now - " + request.transaction.db.version);
</span><del>- request.transaction.db.close();
</del><span class="cx"> secondPhase();
</span><span class="cx"> }
</span><span class="cx"> request.transaction.onabort = function()
</span><span class="lines">@@ -56,9 +55,10 @@
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><span class="cx"> alert("Successfully opened database at version 1 (secondPhase)");
</span><del>- request.result.close();
- request.result.close(); // Close it twice just for the heck of it
- thirdPhase();
</del><ins>+
+ // FIXME: The following call will be used once bugs 150147-150150 are resolved.
+ // thirdPhase();
+ done();
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span><span class="lines">@@ -78,13 +78,13 @@
</span><span class="cx"> alert(request + " (thirdPhase)");
</span><span class="cx"> request.onsuccess = function()
</span><span class="cx"> {
</span><del>- alert("Unexpected success (thirdPhase)");
- done();
</del><ins>+ alert("Unexpected success (thirdPhase)");
+ done();
</ins><span class="cx"> }
</span><span class="cx"> request.onerror = function(e)
</span><span class="cx"> {
</span><del>- alert("Unexpected error (thirdPhase)");
- done();
</del><ins>+ alert("Unexpected error (thirdPhase)");
+ done();
</ins><span class="cx"> }
</span><span class="cx"> request.onupgradeneeded = function(e)
</span><span class="cx"> {
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> request.transaction.oncomplete = function()
</span><span class="cx"> {
</span><span class="cx"> alert("Version change complete (thirdPhase). Database version is now - " + request.transaction.db.version);
</span><del>- request.transaction.db.close();
</del><span class="cx"> fourthPhase();
</span><span class="cx"> }
</span><span class="cx"> request.transaction.onabort = function()
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/ChangeLog 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r191156.
+ https://bugs.webkit.org/show_bug.cgi?id=150215
+
+ Introduced crashing test (Requested by bradee-oh on #webkit).
+
+ Reverted changeset:
+
+ "Modern IDB: Support IDBDatabase.close()."
+ https://bugs.webkit.org/show_bug.cgi?id=150150
+ http://trac.webkit.org/changeset/191156
+
</ins><span class="cx"> 2015-10-15 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Support IDBDatabase.close().
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -120,13 +120,6 @@
</span><span class="cx"> // FIXME: Implement versionchange events firing on already-open transactions.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionToServer::databaseConnectionClosed(IDBDatabase& database)
-{
- LOG(IndexedDB, "IDBConnectionToServer::databaseConnectionClosed");
-
- m_delegate->databaseConnectionClosed(database.databaseConnectionIdentifier());
-}
-
</del><span class="cx"> void IDBConnectionToServer::registerDatabaseConnection(IDBDatabase& database)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_databaseConnections.contains(&database));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx">
</span><span class="cx"> void fireVersionChangeEvent(uint64_t databaseConnectionIdentifier, uint64_t requestedVersion);
</span><span class="cx">
</span><del>- void databaseConnectionClosed(IDBDatabase&);
</del><span class="cx"> void registerDatabaseConnection(IDBDatabase&);
</span><span class="cx"> void unregisterDatabaseConnection(IDBDatabase&);
</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 (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServerDelegate.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> virtual void deleteDatabase(IDBRequestData&) = 0;
</span><span class="cx"> virtual void openDatabase(IDBRequestData&) = 0;
</span><span class="cx"> virtual void commitTransaction(IDBResourceIdentifier&) = 0;
</span><del>- virtual void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) = 0;
</del><span class="cx">
</span><span class="cx"> virtual void ref() = 0;
</span><span class="cx"> virtual void deref() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -44,18 +44,17 @@
</span><span class="cx">
</span><span class="cx"> IDBDatabase::IDBDatabase(ScriptExecutionContext& context, IDBConnectionToServer& connection, const IDBResultData& resultData)
</span><span class="cx"> : WebCore::IDBDatabase(&context)
</span><del>- , m_serverConnection(connection)
</del><ins>+ , m_connection(connection)
</ins><span class="cx"> , m_info(resultData.databaseInfo())
</span><del>- , m_databaseConnectionIdentifier(resultData.databaseConnectionIdentifier())
</del><span class="cx"> {
</span><span class="cx"> suspendIfNeeded();
</span><span class="cx"> relaxAdoptionRequirement();
</span><del>- m_serverConnection->registerDatabaseConnection(*this);
</del><ins>+ m_connection->registerDatabaseConnection(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBDatabase::~IDBDatabase()
</span><span class="cx"> {
</span><del>- m_serverConnection->unregisterDatabaseConnection(*this);
</del><ins>+ m_connection->unregisterDatabaseConnection(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String IDBDatabase::name() const
</span><span class="lines">@@ -105,25 +104,9 @@
</span><span class="cx">
</span><span class="cx"> void IDBDatabase::close()
</span><span class="cx"> {
</span><del>- m_closePending = true;
- maybeCloseInServer();
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBDatabase::maybeCloseInServer()
-{
- if (m_closedInServer)
- return;
-
- // 3.3.9 Database closing steps
- // Wait for all transactions created using this connection to complete.
- // Once they are complete, this connection is closed.
- if (!m_activeTransactions.isEmpty() || !m_committingTransactions.isEmpty())
- return;
-
- m_closedInServer = true;
- m_serverConnection->databaseConnectionClosed(*this);
-}
-
</del><span class="cx"> const char* IDBDatabase::activeDOMObjectName() const
</span><span class="cx"> {
</span><span class="cx"> return "IDBDatabase";
</span><span class="lines">@@ -159,7 +142,7 @@
</span><span class="cx"> ASSERT(refTransaction);
</span><span class="cx"> m_committingTransactions.set(transaction.info().identifier(), WTF::move(refTransaction));
</span><span class="cx">
</span><del>- m_serverConnection->commitTransaction(transaction);
</del><ins>+ m_connection->commitTransaction(transaction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBDatabase::didCommitTransaction(IDBTransaction& transaction)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBDatabaseImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> virtual bool canSuspendForPageCache() const override final;
</span><span class="cx">
</span><span class="cx"> const IDBDatabaseInfo& info() const { return m_info; }
</span><del>- uint64_t databaseConnectionIdentifier() const { return m_databaseConnectionIdentifier; }
</del><span class="cx">
</span><span class="cx"> Ref<IDBTransaction> startVersionChangeTransaction(const IDBTransactionInfo&);
</span><span class="cx"> void commitTransaction(IDBTransaction&);
</span><span class="lines">@@ -81,16 +80,10 @@
</span><span class="cx"> IDBDatabase(ScriptExecutionContext&, IDBConnectionToServer&, const IDBResultData&);
</span><span class="cx">
</span><span class="cx"> void didCommitOrAbortTransaction(IDBTransaction&);
</span><del>-
- void maybeCloseInServer();
-
- Ref<IDBConnectionToServer> m_serverConnection;
</del><ins>+
+ Ref<IDBConnectionToServer> m_connection;
</ins><span class="cx"> IDBDatabaseInfo m_info;
</span><del>- uint64_t m_databaseConnectionIdentifier { 0 };
</del><span class="cx">
</span><del>- bool m_closePending { false };
- bool m_closedInServer { false };
-
</del><span class="cx"> RefPtr<IDBTransaction> m_versionChangeTransaction;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_activeTransactions;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<IDBTransaction>> m_committingTransactions;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::IDBAny> IDBRequest::result(ExceptionCode&) const
</span><span class="cx"> {
</span><del>- return m_result;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned short IDBRequest::errorCode(ExceptionCode&) const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -156,17 +156,6 @@
</span><span class="cx"> transaction->commit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
-{
- LOG(IndexedDB, "IDBServer::databaseConnectionClosed");
-
- auto databaseConnection = m_databaseConnections.get(databaseConnectionIdentifier);
- if (!databaseConnection)
- return;
-
- databaseConnection->connectionClosedFromClient();
-}
-
</del><span class="cx"> void IDBServer::postDatabaseTask(std::unique_ptr<CrossThreadTask>&& task)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> void openDatabase(const IDBRequestData&);
</span><span class="cx"> void deleteDatabase(const IDBRequestData&);
</span><span class="cx"> void commitTransaction(const IDBResourceIdentifier&);
</span><del>- void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
</del><span class="cx">
</span><span class="cx"> void postDatabaseTask(std::unique_ptr<CrossThreadTask>&&);
</span><span class="cx"> void postDatabaseTaskReply(std::unique_ptr<CrossThreadTask>&&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<UniqueIDBDatabaseConnection> connection = UniqueIDBDatabaseConnection::create(*this, operation->connection());
</span><span class="cx"> UniqueIDBDatabaseConnection* rawConnection = &connection.get();
</span><ins>+ m_server.registerDatabaseConnection(*rawConnection);
</ins><span class="cx">
</span><span class="cx"> if (requestedVersion == m_databaseInfo->version()) {
</span><span class="cx"> addOpenDatabaseConnection(WTF::move(connection));
</span><span class="lines">@@ -250,26 +251,6 @@
</span><span class="cx"> m_versionChangeTransaction = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::connectionClosedFromClient(UniqueIDBDatabaseConnection& connection)
-{
- ASSERT(isMainThread());
- LOG(IndexedDB, "(main) UniqueIDBDatabase::connectionClosedFromClient");
-
- if (m_versionChangeDatabaseConnection == &connection)
- m_versionChangeDatabaseConnection = nullptr;
-
- ASSERT(m_openDatabaseConnections.contains(&connection));
-
- auto removedConnection = m_openDatabaseConnections.take(&connection);
- if (removedConnection->hasNonFinishedTransactions()) {
- m_closePendingDatabaseConnections.add(WTF::move(removedConnection));
- return;
- }
-
- // FIXME: Now that a database connection has closed, previously blocked transactions might be runnable.
- // Try to run them now.
-}
-
</del><span class="cx"> void UniqueIDBDatabase::performErrorCallback(uint64_t callbackIdentifier, const IDBError& error)
</span><span class="cx"> {
</span><span class="cx"> auto callback = m_errorCallbacks.take(callbackIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx">
</span><span class="cx"> void commitTransaction(UniqueIDBDatabaseTransaction&, ErrorCallback);
</span><span class="cx"> void transactionDestroyed(UniqueIDBDatabaseTransaction&);
</span><del>- void connectionClosedFromClient(UniqueIDBDatabaseConnection&);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(IDBServer&, const IDBDatabaseIdentifier&);
</span><span class="lines">@@ -95,7 +94,6 @@
</span><span class="cx"> Deque<Ref<IDBServerOperation>> m_pendingOpenDatabaseOperations;
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<UniqueIDBDatabaseConnection>> m_openDatabaseConnections;
</span><del>- HashSet<RefPtr<UniqueIDBDatabaseConnection>> m_closePendingDatabaseConnections;
</del><span class="cx">
</span><span class="cx"> RefPtr<IDBServerOperation> m_versionChangeOperation;
</span><span class="cx"> RefPtr<UniqueIDBDatabaseConnection> m_versionChangeDatabaseConnection;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -29,10 +29,8 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBConnectionToClient.h"
</span><del>-#include "IDBServer.h"
</del><span class="cx"> #include "IDBTransactionInfo.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "UniqueIDBDatabase.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace IDBServer {
</span><span class="lines">@@ -53,27 +51,8 @@
</span><span class="cx"> , m_database(database)
</span><span class="cx"> , m_connectionToClient(connection)
</span><span class="cx"> {
</span><del>- m_database.server().registerDatabaseConnection(*this);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-UniqueIDBDatabaseConnection::~UniqueIDBDatabaseConnection()
-{
- m_database.server().unregisterDatabaseConnection(*this);
-}
-
-bool UniqueIDBDatabaseConnection::hasNonFinishedTransactions() const
-{
- return !m_transactionMap.isEmpty();
-}
-
-void UniqueIDBDatabaseConnection::connectionClosedFromClient()
-{
- LOG(IndexedDB, "UniqueIDBDatabaseConnection::connectionClosedFromClient");
-
- m_closePending = true;
- m_database.connectionClosedFromClient(*this);
-}
-
</del><span class="cx"> void UniqueIDBDatabaseConnection::fireVersionChangeEvent(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 (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -47,18 +47,12 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<UniqueIDBDatabaseConnection> create(UniqueIDBDatabase&, IDBConnectionToClient&);
</span><span class="cx">
</span><del>- ~UniqueIDBDatabaseConnection();
-
</del><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="cx"> UniqueIDBDatabase& database() { return m_database; }
</span><span class="cx"> IDBConnectionToClient& connectionToClient() { return m_connectionToClient; }
</span><span class="cx">
</span><del>- void connectionClosedFromClient();
-
</del><span class="cx"> bool closePending() const { return m_closePending; }
</span><span class="cx">
</span><del>- bool hasNonFinishedTransactions() const;
-
</del><span class="cx"> void fireVersionChangeEvent(uint64_t requestedVersion);
</span><span class="cx"> UniqueIDBDatabaseTransaction& createVersionChangeTransaction(uint64_t newVersion);
</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 (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.cpp 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -127,14 +127,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InProcessIDBServer::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
-{
- RefPtr<InProcessIDBServer> self(this);
- RunLoop::current().dispatch([this, self, databaseConnectionIdentifier] {
- m_server->databaseConnectionClosed(databaseConnectionIdentifier);
- });
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedInProcessIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h (191156 => 191157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2015-10-16 00:25:02 UTC (rev 191156)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h 2015-10-16 00:34:38 UTC (rev 191157)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> virtual void deleteDatabase(IDBRequestData&) override final;
</span><span class="cx"> virtual void openDatabase(IDBRequestData&) override final;
</span><span class="cx"> virtual void commitTransaction(IDBResourceIdentifier&) override final;
</span><del>- virtual void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) override final;
</del><span class="cx">
</span><span class="cx"> // IDBConnectionToClient
</span><span class="cx"> virtual uint64_t identifier() const override;
</span></span></pre>
</div>
</div>
</body>
</html>