<!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>[172248] branches/safari-600.1-branch/Source</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/172248">172248</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 13:49:46 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172193">r172193</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesindexeddbIDBServerConnectionh">branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBServerConnection.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesindexeddbIDBTransactionBackendcpp">branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp</a></li>
<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="#branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectionh">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in</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>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh">branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172193
+
+ 2014-08-06 Brady Eidson <beidson@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 David Kilzer.
+
+ No new tests (Covered by existing tests).
+
+ * Modules/indexeddb/IDBServerConnection.h: Add sync versions of reset/rollback.
+
+ * Modules/indexeddb/IDBTransactionBackend.cpp:
+ (WebCore::IDBTransactionBackend::abort): Call the sync versions.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172183
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesindexeddbIDBServerConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBServerConnection.h (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBServerConnection.h        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBServerConnection.h        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -70,7 +70,9 @@
</span><span class="cx"> virtual void beginTransaction(int64_t transactionID, std::function<void()> completionCallback) = 0;
</span><span class="cx"> virtual void commitTransaction(int64_t transactionID, BoolCallbackFunction successCallback) = 0;
</span><span class="cx"> virtual void resetTransaction(int64_t transactionID, std::function<void()> completionCallback) = 0;
</span><ins>+ virtual bool resetTransactionSync(int64_t transactionID) = 0;
</ins><span class="cx"> virtual void rollbackTransaction(int64_t transactionID, std::function<void()> completionCallback) = 0;
</span><ins>+ virtual bool rollbackTransactionSync(int64_t transactionID) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesindexeddbIDBTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> m_taskTimer.stop();
</span><span class="cx">
</span><span class="cx"> if (wasRunning)
</span><del>- m_database->serverConnection().rollbackTransaction(m_id, []() { });
</del><ins>+ m_database->serverConnection().rollbackTransactionSync(m_id);
</ins><span class="cx">
</span><span class="cx"> // Run the abort tasks, if any.
</span><span class="cx"> while (!m_abortTaskQueue.isEmpty()) {
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> // itself to be released, and order is critical.
</span><span class="cx"> closeOpenCursors();
</span><span class="cx">
</span><del>- m_database->serverConnection().resetTransaction(m_id, []() { });
</del><ins>+ m_database->serverConnection().resetTransactionSync(m_id);
</ins><span class="cx">
</span><span class="cx"> // Transactions must also be marked as completed before the front-end is notified, as
</span><span class="cx"> // the transaction completion unblocks operations like closing connections.
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172193
+
+ 2014-08-06 Brady Eidson and Jeffrey Pfau <beidson@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 and David Kilzer.
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::didReceiveMessage):
+ (WebKit::DatabaseToWebProcessConnection::didReceiveSyncMessage): Added.
+ (WebKit::DatabaseToWebProcessConnection::didClose):
+ * DatabaseProcess/DatabaseToWebProcessConnection.h:
+
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::resetTransactionSync): Added
+ Wait until the reset is complete before sending the sync reply.
+ (WebKit::DatabaseProcessIDBConnection::rollbackTransactionSync): Added.
+ Ditto.
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+
+ Keep track of all in progress transactions and make sure they’re cleaned up
+ whenever a connection to a WebProcess is broken:
+ * 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):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::rollbackTransaction):
+
+ Add sync versions of reset/rollback:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::resetTransactionSync):
+ (WebKit::WebIDBServerConnection::rollbackTransactionSync):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172172
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -65,15 +65,29 @@
</span><span class="cx"> backendIterator->value->didReceiveDatabaseProcessIDBConnectionMessage(connection, decoder);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseToWebProcessConnection::didClose(IPC::Connection*)
</del><ins>+void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection* connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& reply)
</ins><span class="cx"> {
</span><ins>+ if (decoder.messageReceiverName() == Messages::DatabaseProcessIDBConnection::messageReceiverName()) {
+ IDBConnectionMap::iterator backendIterator = m_idbConnections.find(decoder.destinationID());
+ if (backendIterator != m_idbConnections.end())
+ backendIterator->value->didReceiveSyncDatabaseProcessIDBConnectionMessage(connection, decoder, reply);
+ return;
+ }
</ins><span class="cx">
</span><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseToWebProcessConnection::didClose(IPC::Connection*)
+{
+ // 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"> void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
</span><span class="cx"> {
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
</span><ins>+ virtual void didReceiveSyncMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
</ins><span class="cx"> virtual void didClose(IPC::Connection*) override;
</span><span class="cx"> virtual void didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
</span><span class="cx"> void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -186,6 +186,24 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcessIDBConnection::resetTransactionSync(int64_t transactionID, PassRefPtr<Messages::DatabaseProcessIDBConnection::ResetTransactionSync::DelayedReply> prpReply)
+{
+ RefPtr<Messages::DatabaseProcessIDBConnection::ResetTransactionSync::DelayedReply> reply(prpReply);
+ RefPtr<DatabaseProcessIDBConnection> connection(this);
+ m_uniqueIDBDatabase->resetTransaction(IDBIdentifier(*this, transactionID), [connection, reply](bool success) {
+ reply->send(success);
+ });
+}
+
+void DatabaseProcessIDBConnection::rollbackTransactionSync(int64_t transactionID, PassRefPtr<Messages::DatabaseProcessIDBConnection::RollbackTransactionSync::DelayedReply> prpReply)
+{
+ RefPtr<Messages::DatabaseProcessIDBConnection::RollbackTransactionSync::DelayedReply> reply(prpReply);
+ RefPtr<DatabaseProcessIDBConnection> connection(this);
+ m_uniqueIDBDatabase->rollbackTransaction(IDBIdentifier(*this, transactionID), [connection, reply](bool success) {
+ reply->send(success);
+ });
+}
+
</ins><span class="cx"> void DatabaseProcessIDBConnection::changeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "DatabaseProcessIDBConnectionMessages.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void didReceiveDatabaseProcessIDBConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
</span><ins>+ void didReceiveSyncDatabaseProcessIDBConnectionMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
</ins><span class="cx">
</span><span class="cx"> void disconnectedFromWebProcess();
</span><span class="cx">
</span><span class="lines">@@ -74,6 +76,8 @@
</span><span class="cx"> void commitTransaction(uint64_t requestID, int64_t transactionID);
</span><span class="cx"> void resetTransaction(uint64_t requestID, int64_t transactionID);
</span><span class="cx"> void rollbackTransaction(uint64_t requestID, int64_t transactionID);
</span><ins>+ void resetTransactionSync(int64_t transactionID, PassRefPtr<Messages::DatabaseProcessIDBConnection::ResetTransactionSync::DelayedReply>);
+ void rollbackTransactionSync(int64_t transactionID, PassRefPtr<Messages::DatabaseProcessIDBConnection::RollbackTransactionSync::DelayedReply>);
</ins><span class="cx"> void changeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion);
</span><span class="cx"> void createObjectStore(uint64_t requestID, int64_t transactionID, WebCore::IDBObjectStoreMetadata);
</span><span class="cx"> void deleteObjectStore(uint64_t requestID, int64_t transactionID, int64_t objectStoreID);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -32,6 +32,9 @@
</span><span class="cx"> CommitTransaction(uint64_t requestID, int64_t transactionID)
</span><span class="cx"> ResetTransaction(uint64_t requestID, int64_t transactionID)
</span><span class="cx"> RollbackTransaction(uint64_t requestID, int64_t transactionID)
</span><ins>+
+ ResetTransactionSync(int64_t transactionID) -> (bool success) Delayed
+ RollbackTransactionSync(int64_t transactionID) -> (bool success) Delayed
</ins><span class="cx">
</span><span class="cx"> ChangeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion)
</span><span class="cx"> CreateObjectStore(uint64_t requestID, int64_t transactionID, WebCore::IDBObjectStoreMetadata objectStoreMetadata)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp        2014-08-07 20:49:46 UTC (rev 172248)
</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 (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h        2014-08-07 20:49:46 UTC (rev 172248)
</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 (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp        2014-08-07 20:49:46 UTC (rev 172248)
</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>
<a id="branchessafari6001branchSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -266,6 +266,13 @@
</span><span class="cx"> serverRequest->completeRequest();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebIDBServerConnection::resetTransactionSync(int64_t transactionID)
+{
+ bool success;
+ sendSync(Messages::DatabaseProcessIDBConnection::ResetTransactionSync(transactionID), Messages::DatabaseProcessIDBConnection::ResetTransactionSync::Reply(success));
+ return success;
+}
+
</ins><span class="cx"> void WebIDBServerConnection::rollbackTransaction(int64_t transactionID, std::function<void()> completionCallback)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<>::create(completionCallback, completionCallback);
</span><span class="lines">@@ -291,6 +298,13 @@
</span><span class="cx"> serverRequest->completeRequest();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebIDBServerConnection::rollbackTransactionSync(int64_t transactionID)
+{
+ bool success;
+ sendSync(Messages::DatabaseProcessIDBConnection::RollbackTransactionSync(transactionID), Messages::DatabaseProcessIDBConnection::RollbackTransactionSync::Reply(success));
+ return success;
+}
+
</ins><span class="cx"> void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h (172247 => 172248)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h        2014-08-07 20:47:03 UTC (rev 172247)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h        2014-08-07 20:49:46 UTC (rev 172248)
</span><span class="lines">@@ -64,7 +64,9 @@
</span><span class="cx"> virtual void beginTransaction(int64_t transactionID, std::function<void()> completionCallback) override;
</span><span class="cx"> virtual void commitTransaction(int64_t transactionID, BoolCallbackFunction successCallback) override;
</span><span class="cx"> virtual void resetTransaction(int64_t transactionID, std::function<void()> completionCallback) override;
</span><ins>+ virtual bool resetTransactionSync(int64_t transactionID) override;
</ins><span class="cx"> virtual void rollbackTransaction(int64_t transactionID, std::function<void()> completionCallback) override;
</span><ins>+ virtual bool rollbackTransactionSync(int64_t transactionID) override;
</ins><span class="cx">
</span><span class="cx"> virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const WebCore::IDBObjectStoreMetadata&, WebCore::IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>>& indexKeys, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>