<!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>[171732] branches/safari-600.1-branch/Source/WebKit2</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/171732">171732</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 01:36:44 -0700 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171704">r171704</a>. <rdar://problem/17356958></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171731 => 171732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-29 08:34:42 UTC (rev 171731)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-29 08:36:44 UTC (rev 171732)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-07-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171704
+
+ 2014-07-25 Jeffrey Pfau <jpfau@apple.com>
+
+ IDB transactions never reset if the Web Process ends before cleaning up
+ https://bugs.webkit.org/show_bug.cgi?id=135218
+
+ Reviewed by Darin Adler.
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::didClose):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::unregisterConnection):
+ (WebKit::UniqueIDBDatabase::didCompleteTransactionOperation):
+ (WebKit::UniqueIDBDatabase::openBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::resetBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::didEstablishTransaction):
+ (WebKit::UniqueIDBDatabase::didResetTransaction):
+ (WebKit::UniqueIDBDatabase::resetAllTransactions):
+ (WebKit::UniqueIDBDatabase::finalizeRollback):
+ (WebKit::UniqueIDBDatabase::absoluteDatabaseDirectory):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::rollbackTransaction):
+
</ins><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171663. <rdar://problem/17818308>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (171731 => 171732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2014-07-29 08:34:42 UTC (rev 171731)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2014-07-29 08:36:44 UTC (rev 171732)
</span><span class="lines">@@ -71,7 +71,9 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseToWebProcessConnection::didClose(IPC::Connection*)
</span><span class="cx"> {
</span><del>-
</del><ins>+ // The WebProcess has disconnected, close all of the connections associated with it
+ while (!m_idbConnections.isEmpty())
+ removeDatabaseProcessIDBConnection(m_idbConnections.begin()->key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (171731 => 171732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-07-29 08:34:42 UTC (rev 171731)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-07-29 08:36:44 UTC (rev 171732)
</span><span class="lines">@@ -113,9 +113,10 @@
</span><span class="cx"> void UniqueIDBDatabase::unregisterConnection(DatabaseProcessIDBConnection& connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_connections.contains(&connection));
</span><ins>+ resetAllTransactions(connection);
</ins><span class="cx"> m_connections.remove(&connection);
</span><span class="cx">
</span><del>- if (m_connections.isEmpty()) {
</del><ins>+ if (m_connections.isEmpty() && m_pendingTransactionRollbacks.isEmpty()) {
</ins><span class="cx"> shutdown(UniqueIDBDatabaseShutdownType::NormalShutdown);
</span><span class="cx"> DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -337,10 +338,12 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = m_pendingTransactionRequests.take(transactionIdentifier);
</span><del>- if (!request)
- return;
</del><span class="cx">
</span><del>- request->completeRequest(success);
</del><ins>+ if (request)
+ request->completeRequest(success);
+
+ if (m_pendingTransactionRollbacks.contains(transactionIdentifier))
+ finalizeRollback(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion, std::function<void(bool)> successCallback)
</span><span class="lines">@@ -714,6 +717,7 @@
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->establishTransaction(transactionIdentifier, objectStoreIDs, mode);
</span><span class="cx">
</span><ins>+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didEstablishTransaction, transactionIdentifier, success));
</ins><span class="cx"> postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didCompleteTransactionOperation, transactionIdentifier, success));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -744,6 +748,7 @@
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->resetTransaction(transactionIdentifier);
</span><span class="cx">
</span><ins>+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didResetTransaction, transactionIdentifier, success));
</ins><span class="cx"> postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didCompleteTransactionOperation, transactionIdentifier, success));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1070,6 +1075,62 @@
</span><span class="cx"> request->completeRequest(errorCode, errorMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::didEstablishTransaction(const IDBIdentifier& transactionIdentifier, bool success)
+{
+ ASSERT(RunLoop::isMain());
+ if (!success)
+ return;
+
+ auto transactions = m_establishedTransactions.add(&transactionIdentifier.connection(), HashSet<IDBIdentifier>());
+ transactions.iterator->value.add(transactionIdentifier);
+}
+
+void UniqueIDBDatabase::didResetTransaction(const IDBIdentifier& transactionIdentifier, bool success)
+{
+ ASSERT(RunLoop::isMain());
+ if (!success)
+ return;
+
+ auto transactions = m_establishedTransactions.find(&transactionIdentifier.connection());
+ if (transactions != m_establishedTransactions.end())
+ transactions.get()->value.remove(transactionIdentifier);
+}
+
+void UniqueIDBDatabase::resetAllTransactions(const DatabaseProcessIDBConnection& connection)
+{
+ ASSERT(RunLoop::isMain());
+ auto transactions = m_establishedTransactions.find(&connection);
+ if (transactions == m_establishedTransactions.end() || !m_acceptingNewRequests)
+ return;
+
+ for (auto& transactionIdentifier : transactions.get()->value) {
+ m_pendingTransactionRollbacks.add(transactionIdentifier);
+ if (!m_pendingTransactionRequests.contains(transactionIdentifier))
+ finalizeRollback(transactionIdentifier);
+ }
+}
+
+void UniqueIDBDatabase::finalizeRollback(const WebKit::IDBIdentifier& transactionId)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(m_pendingTransactionRollbacks.contains(transactionId));
+ ASSERT(!m_pendingTransactionRequests.contains(transactionId));
+ rollbackTransaction(transactionId, [this, transactionId](bool) {
+ ASSERT(RunLoop::isMain());
+ if (m_pendingTransactionRequests.contains(transactionId))
+ return;
+
+ ASSERT(m_pendingTransactionRollbacks.contains(transactionId));
+ m_pendingTransactionRollbacks.remove(transactionId);
+ resetTransaction(transactionId, [this, transactionId](bool) {
+ if (m_acceptingNewRequests && m_connections.isEmpty() && m_pendingTransactionRollbacks.isEmpty()) {
+ shutdown(UniqueIDBDatabaseShutdownType::NormalShutdown);
+ DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
+ }
+ });
+ });
+}
+
</ins><span class="cx"> String UniqueIDBDatabase::absoluteDatabaseDirectory() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (171731 => 171732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-07-29 08:34:42 UTC (rev 171731)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-07-29 08:36:44 UTC (rev 171732)
</span><span class="lines">@@ -185,10 +185,17 @@
</span><span class="cx"> void didShutdownBackingStore(UniqueIDBDatabaseShutdownType);
</span><span class="cx"> void didCompleteBoolRequest(uint64_t requestID, bool success);
</span><span class="cx">
</span><ins>+ void didEstablishTransaction(const IDBIdentifier& transactionIdentifier, bool success);
+ void didResetTransaction(const IDBIdentifier& transactionIdentifier, bool success);
+ void resetAllTransactions(const DatabaseProcessIDBConnection&);
+ void finalizeRollback(const IDBIdentifier& transactionId);
+
</ins><span class="cx"> bool m_acceptingNewRequests;
</span><span class="cx">
</span><ins>+ HashMap<const DatabaseProcessIDBConnection*, HashSet<IDBIdentifier>> m_establishedTransactions;
</ins><span class="cx"> Deque<RefPtr<AsyncRequest>> m_pendingMetadataRequests;
</span><span class="cx"> HashMap<IDBIdentifier, RefPtr<AsyncRequest>> m_pendingTransactionRequests;
</span><ins>+ HashSet<IDBIdentifier> m_pendingTransactionRollbacks;
</ins><span class="cx"> HashMap<uint64_t, RefPtr<AsyncRequest>> m_pendingDatabaseTasks;
</span><span class="cx"> RefPtr<AsyncRequest> m_pendingShutdownTask;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (171731 => 171732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-07-29 08:34:42 UTC (rev 171731)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-07-29 08:36:44 UTC (rev 171732)
</span><span class="lines">@@ -391,6 +391,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!transaction->inProgress()) {
+ LOG_ERROR("Attempt to rollback a transaction that hasn't begun");
+ return false;
+ }
+
</ins><span class="cx"> return transaction->rollback();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>