<!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>[161076] trunk/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/161076">161076</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-12-25 16:29:03 -0800 (Wed, 25 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>DatabaseProcess: Implement version changing
https://bugs.webkit.org/show_bug.cgi?id=126099
Reviewed by Sam Weinig.
Source/WebCore:
No new tests (No change in WebCore behavior).
* Modules/indexeddb/IDBTransactionBackend.cpp:
(WebCore::IDBTransactionBackend::commit): Update some logging.
* Modules/indexeddb/IDBTransactionBackendOperations.cpp:
(WebCore::IDBDatabaseBackend::VersionChangeOperation::perform): Move some things that used to be in
IDBServerConnectionLevelDB::changeDatabaseVersion to this cross-platform location.
* Modules/indexeddb/IDBTransactionBackendOperations.h:
(WebCore::IDBDatabaseBackend::VersionChangeOperation::transaction):
* Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp:
(WebCore::IDBServerConnectionLevelDB::changeDatabaseVersion): Move the actual updating of the database backend
metadata to the VersionChangeOperation.
Source/WebKit2:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata): Add logging.
(WebKit::DatabaseProcessIDBConnection::openTransaction): Ditto.
(WebKit::DatabaseProcessIDBConnection::beginTransaction): Ditto.
(WebKit::DatabaseProcessIDBConnection::commitTransaction): Ditto.
(WebKit::DatabaseProcessIDBConnection::resetTransaction): Ditto.
(WebKit::DatabaseProcessIDBConnection::rollbackTransaction): Ditto.
(WebKit::DatabaseProcessIDBConnection::changeDatabaseVersion): Implement this!
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::shutdown): Clean up all requests, and also cleanup the backing store
on the database queue.
(WebKit::UniqueIDBDatabase::shutdownBackingStore): Shutdown the backing store.
(WebKit::UniqueIDBDatabase::didShutdownBackingStore):
(WebKit::UniqueIDBDatabase::changeDatabaseVersion): Pass along the new version to the database queue.
(WebKit::UniqueIDBDatabase::didChangeDatabaseVersion):
(WebKit::UniqueIDBDatabase::changeDatabaseVersionInBackingStore): Set the new version in the backing store.
(WebKit::UniqueIDBDatabase::postMainThreadTask): Add a ref() to keep the database alive incase it is being
shutdown on the main thread.
(WebKit::UniqueIDBDatabase::performNextMainThreadTask): Balance the ref() from postMainThreadTask, and
accept an empty mainThreadTask queue.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h: Add changeDatabaseVersion.
Flesh out SQLiteIDBTransaction to actually operation on a SQLiteTransaction in a real SQLiteDatabase:
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp:
(WebKit::SQLiteIDBTransaction::SQLiteIDBTransaction):
(WebKit::SQLiteIDBTransaction::~SQLiteIDBTransaction):
(WebKit::SQLiteIDBTransaction::begin):
(WebKit::SQLiteIDBTransaction::commit):
(WebKit::SQLiteIDBTransaction::reset):
(WebKit::SQLiteIDBTransaction::rollback):
(WebKit::SQLiteIDBTransaction::inProgress):
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h:
(WebKit::SQLiteIDBTransaction::create):
(WebKit::SQLiteIDBTransaction::mode):
Rename m_metadataDB to m_sqliteDB,
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath): Disable threading checks on the DB
as work queues can change threads.
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::establishTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::beginTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::changeDatabaseVersion): After validating the transaction, actually
update the version number on disk.
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::~WebIDBServerConnection): Make sure to abort in-flight requests.
(WebKit::WebIDBServerConnection::changeDatabaseVersion):
(WebKit::WebIDBServerConnection::didChangeDatabaseVersion):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendcpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationsh">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbleveldbIDBServerConnectionLevelDBcpp">trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStoreh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBTransactioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBTransactionh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLiteh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionmessagesin">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebCore/ChangeLog 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-12-25 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess: Implement version changing
+ https://bugs.webkit.org/show_bug.cgi?id=126099
+
+ Reviewed by Sam Weinig.
+
+ No new tests (No change in WebCore behavior).
+
+ * Modules/indexeddb/IDBTransactionBackend.cpp:
+ (WebCore::IDBTransactionBackend::commit): Update some logging.
+
+ * Modules/indexeddb/IDBTransactionBackendOperations.cpp:
+ (WebCore::IDBDatabaseBackend::VersionChangeOperation::perform): Move some things that used to be in
+ IDBServerConnectionLevelDB::changeDatabaseVersion to this cross-platform location.
+ * Modules/indexeddb/IDBTransactionBackendOperations.h:
+ (WebCore::IDBDatabaseBackend::VersionChangeOperation::transaction):
+
+ * Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp:
+ (WebCore::IDBServerConnectionLevelDB::changeDatabaseVersion): Move the actual updating of the database backend
+ metadata to the VersionChangeOperation.
+
</ins><span class="cx"> 2013-12-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Clean up generated sources directories
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> void IDBTransactionBackend::commit()
</span><span class="cx"> {
</span><del>- LOG(StorageAPI, "IDBTransactionBackend::commit");
</del><ins>+ LOG(StorageAPI, "IDBTransactionBackend::commit (Transaction %lli)", m_id);
</ins><span class="cx">
</span><span class="cx"> // In multiprocess ports, front-end may have requested a commit but an abort has already
</span><span class="cx"> // been initiated asynchronously by the back-end.
</span><span class="lines">@@ -213,8 +213,10 @@
</span><span class="cx">
</span><span class="cx"> // Front-end has requested a commit, but there may be tasks like createIndex which
</span><span class="cx"> // are considered synchronous by the front-end but are processed asynchronously.
</span><del>- if (hasPendingTasks())
</del><ins>+ if (hasPendingTasks()) {
+ LOG(StorageAPI, "IDBTransactionBackend::commit - Not committing now, transaction still has pending tasks (Transaction %lli)", m_id);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // The last reference to this object may be released while performing the
</span><span class="cx"> // commit steps below. We therefore take a self reference to keep ourselves
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -173,9 +173,24 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(StorageAPI, "VersionChangeOperation");
</span><span class="cx">
</span><ins>+ uint64_t oldVersion = m_transaction->database().metadata().version;
</ins><span class="cx"> RefPtr<IDBDatabaseBackend::VersionChangeOperation> operation(this);
</span><del>- STANDARD_DATABASE_ERROR_CALLBACK;
</del><ins>+ ASSERT(static_cast<uint64_t>(m_version) > oldVersion);
</ins><span class="cx">
</span><ins>+ std::function<void(PassRefPtr<IDBDatabaseError>)> operationCallback = [oldVersion, operation, this, completionCallback](PassRefPtr<IDBDatabaseError> prpError) {
+ RefPtr<IDBDatabaseError> error = prpError;
+ if (error) {
+ m_callbacks->onError(error);
+ m_transaction->abort(error);
+ } else {
+ ASSERT(!m_transaction->database().hasPendingSecondHalfOpen());
+ m_transaction->database().setCurrentVersion(m_version);
+ m_transaction->database().setPendingSecondHalfOpen(IDBPendingOpenCall::create(*m_callbacks, *m_databaseCallbacks, m_transaction->id(), m_version));
+ m_callbacks->onUpgradeNeeded(oldVersion, &m_transaction->database(), m_transaction->database().metadata());
+ }
+ completionCallback();
+ };
+
</ins><span class="cx"> m_transaction->database().serverConnection().changeDatabaseVersion(*m_transaction, *this, operationCallback);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> }
</span><span class="cx"> virtual void perform(std::function<void()> successCallback) OVERRIDE FINAL;
</span><span class="cx">
</span><ins>+ IDBTransactionBackend* transaction() const { return m_transaction.get(); }
</ins><span class="cx"> int64_t version() const { return m_version; }
</span><span class="cx"> IDBCallbacks* callbacks() const { return m_callbacks.get(); }
</span><span class="cx"> IDBDatabaseCallbacks* databaseCallbacks() const { return m_databaseCallbacks.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbleveldbIDBServerConnectionLevelDBcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebCore/Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -562,20 +562,12 @@
</span><span class="cx">
</span><span class="cx"> IDBDatabaseBackend& database = transaction.database();
</span><span class="cx"> int64_t databaseId = database.id();
</span><del>- uint64_t oldVersion = database.metadata().version;
</del><span class="cx">
</span><del>- // FIXME: Database versions are now of type uint64_t, but this code expected int64_t.
- ASSERT(operation.version() > (int64_t)oldVersion);
- database.setCurrentVersion(operation.version());
</del><span class="cx"> if (!m_backingStore->updateIDBDatabaseVersion(*backingStoreTransaction, databaseId, database.metadata().version)) {
</span><span class="cx"> RefPtr<IDBDatabaseError> error = IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Error writing data to stable storage when updating version.");
</span><del>- operation.callbacks()->onError(error);
</del><span class="cx"> ASYNC_COMPLETION_CALLBACK_WITH_ARG(completionCallback, error);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ASSERT(!database.hasPendingSecondHalfOpen());
- database.setPendingSecondHalfOpen(IDBPendingOpenCall::create(*operation.callbacks(), *operation.databaseCallbacks(), transaction.id(), operation.version()));
- operation.callbacks()->onUpgradeNeeded(oldVersion, &database, database.metadata());
</del><span class="cx">
</span><span class="cx"> ASYNC_COMPLETION_CALLBACK_WITH_NULL_ARG(completionCallback);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -1,3 +1,70 @@
</span><ins>+2013-12-25 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess: Implement version changing
+ https://bugs.webkit.org/show_bug.cgi?id=126099
+
+ Reviewed by Sam Weinig.
+
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata): Add logging.
+ (WebKit::DatabaseProcessIDBConnection::openTransaction): Ditto.
+ (WebKit::DatabaseProcessIDBConnection::beginTransaction): Ditto.
+ (WebKit::DatabaseProcessIDBConnection::commitTransaction): Ditto.
+ (WebKit::DatabaseProcessIDBConnection::resetTransaction): Ditto.
+ (WebKit::DatabaseProcessIDBConnection::rollbackTransaction): Ditto.
+ (WebKit::DatabaseProcessIDBConnection::changeDatabaseVersion): Implement this!
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::shutdown): Clean up all requests, and also cleanup the backing store
+ on the database queue.
+ (WebKit::UniqueIDBDatabase::shutdownBackingStore): Shutdown the backing store.
+ (WebKit::UniqueIDBDatabase::didShutdownBackingStore):
+ (WebKit::UniqueIDBDatabase::changeDatabaseVersion): Pass along the new version to the database queue.
+ (WebKit::UniqueIDBDatabase::didChangeDatabaseVersion):
+ (WebKit::UniqueIDBDatabase::changeDatabaseVersionInBackingStore): Set the new version in the backing store.
+ (WebKit::UniqueIDBDatabase::postMainThreadTask): Add a ref() to keep the database alive incase it is being
+ shutdown on the main thread.
+ (WebKit::UniqueIDBDatabase::performNextMainThreadTask): Balance the ref() from postMainThreadTask, and
+ accept an empty mainThreadTask queue.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h: Add changeDatabaseVersion.
+
+ Flesh out SQLiteIDBTransaction to actually operation on a SQLiteTransaction in a real SQLiteDatabase:
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp:
+ (WebKit::SQLiteIDBTransaction::SQLiteIDBTransaction):
+ (WebKit::SQLiteIDBTransaction::~SQLiteIDBTransaction):
+ (WebKit::SQLiteIDBTransaction::begin):
+ (WebKit::SQLiteIDBTransaction::commit):
+ (WebKit::SQLiteIDBTransaction::reset):
+ (WebKit::SQLiteIDBTransaction::rollback):
+ (WebKit::SQLiteIDBTransaction::inProgress):
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h:
+ (WebKit::SQLiteIDBTransaction::create):
+ (WebKit::SQLiteIDBTransaction::mode):
+
+ Rename m_metadataDB to m_sqliteDB,
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath): Disable threading checks on the DB
+ as work queues can change threads.
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::establishTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::beginTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::changeDatabaseVersion): After validating the transaction, actually
+ update the version number on disk.
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
+
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::~WebIDBServerConnection): Make sure to abort in-flight requests.
+ (WebKit::WebIDBServerConnection::changeDatabaseVersion):
+ (WebKit::WebIDBServerConnection::didChangeDatabaseVersion):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:
+
</ins><span class="cx"> 2013-12-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Fix CMake style errors in Source/WebKit2/PlatformGTK.cmake
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><span class="cx"> #include "IDBTransactionIdentifier.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "UniqueIDBDatabase.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebIDBServerConnectionMessages.h"
</span><span class="lines">@@ -68,6 +69,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><ins>+ LOG(IDB, "DatabaseProcess getOrEstablishIDBDatabaseMetadata request ID %llu", requestID);
+
</ins><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><span class="cx"> m_uniqueIDBDatabase->getOrEstablishIDBDatabaseMetadata([connection, requestID](bool success, const IDBDatabaseMetadata& metadata) {
</span><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidGetOrEstablishIDBDatabaseMetadata(requestID, success, metadata));
</span><span class="lines">@@ -78,6 +81,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><ins>+ LOG(IDB, "DatabaseProcess openTransaction request ID %llu", requestID);
+
</ins><span class="cx"> if (intMode > IndexedDB::TransactionModeMaximum) {
</span><span class="cx"> send(Messages::WebIDBServerConnection::DidOpenTransaction(requestID, false));
</span><span class="cx"> return;
</span><span class="lines">@@ -94,6 +99,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><ins>+ LOG(IDB, "DatabaseProcess beginTransaction request ID %llu", requestID);
+
</ins><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><span class="cx"> m_uniqueIDBDatabase->beginTransaction(IDBTransactionIdentifier(*this, transactionID), [connection, requestID](bool success) {
</span><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidBeginTransaction(requestID, success));
</span><span class="lines">@@ -104,6 +111,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><ins>+ LOG(IDB, "DatabaseProcess commitTransaction request ID %llu", requestID);
+
</ins><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><span class="cx"> m_uniqueIDBDatabase->commitTransaction(IDBTransactionIdentifier(*this, transactionID), [connection, requestID](bool success) {
</span><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidCommitTransaction(requestID, success));
</span><span class="lines">@@ -114,6 +123,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><ins>+ LOG(IDB, "DatabaseProcess resetTransaction request ID %llu", requestID);
+
</ins><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><span class="cx"> m_uniqueIDBDatabase->resetTransaction(IDBTransactionIdentifier(*this, transactionID), [connection, requestID](bool success) {
</span><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidResetTransaction(requestID, success));
</span><span class="lines">@@ -124,12 +135,26 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><ins>+ LOG(IDB, "DatabaseProcess rollbackTransaction request ID %llu", requestID);
+
</ins><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><span class="cx"> m_uniqueIDBDatabase->rollbackTransaction(IDBTransactionIdentifier(*this, transactionID), [connection, requestID](bool success) {
</span><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidRollbackTransaction(requestID, success));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcessIDBConnection::changeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion)
+{
+ ASSERT(m_uniqueIDBDatabase);
+
+ LOG(IDB, "DatabaseProcess changeDatabaseVersion request ID %llu, new version %llu", requestID, newVersion);
+
+ RefPtr<DatabaseProcessIDBConnection> connection(this);
+ m_uniqueIDBDatabase->changeDatabaseVersion(IDBTransactionIdentifier(*this, transactionID), newVersion, [connection, requestID](bool success) {
+ connection->send(Messages::WebIDBServerConnection::DidChangeDatabaseVersion(requestID, success));
+ });
+}
+
</ins><span class="cx"> CoreIPC::Connection* DatabaseProcessIDBConnection::messageSenderConnection()
</span><span class="cx"> {
</span><span class="cx"> return m_connection->connection();
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -68,7 +68,9 @@
</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 changeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> Ref<DatabaseToWebProcessConnection> m_connection;
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -31,6 +31,8 @@
</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>+
+ ChangeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -122,12 +122,38 @@
</span><span class="cx"> m_mainThreadTasks.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- while (!m_pendingMetadataRequests.isEmpty()) {
- auto request = m_pendingMetadataRequests.takeFirst();
- request->requestAborted();
- }
</del><ins>+ for (const auto& it : m_pendingMetadataRequests)
+ it->requestAborted();
+
+ for (const auto& it : m_pendingTransactionRequests)
+ it.value->requestAborted();
+
+ for (const auto& it : m_pendingDatabaseTasks)
+ it.value->requestAborted();
+
+ // Balanced by an adoptRef in ::didShutdownBackingStore()
+ ref();
+
+ DatabaseProcess::shared().queue().dispatch(bind(&UniqueIDBDatabase::shutdownBackingStore, this));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::shutdownBackingStore()
+{
+ ASSERT(!isMainThread());
+ if (m_backingStore)
+ m_backingStore.clear();
+
+ RunLoop::main()->dispatch(bind(&UniqueIDBDatabase::didShutdownBackingStore, this));
+}
+
+void UniqueIDBDatabase::didShutdownBackingStore()
+{
+ ASSERT(isMainThread());
+
+ // Balanced by a ref in ::shutdown()
+ RefPtr<UniqueIDBDatabase> protector(adoptRef(this));
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const IDBDatabaseMetadata&)> completionCallback)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -258,6 +284,41 @@
</span><span class="cx"> request->completeRequest(success);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::changeDatabaseVersion(const IDBTransactionIdentifier& identifier, uint64_t newVersion, std::function<void(bool)> successCallback)
+{
+ ASSERT(isMainThread());
+
+ if (!m_acceptingNewRequests) {
+ successCallback(false);
+ return;
+ }
+
+ uint64_t oldVersion = m_metadata->version;
+ m_metadata->version = newVersion;
+
+ RefPtr<AsyncRequest> request = AsyncRequestImpl<bool>::create([this, oldVersion, successCallback](bool success) {
+ if (!success)
+ m_metadata->version = oldVersion;
+ successCallback(success);
+ }, [this, oldVersion, successCallback]() {
+ m_metadata->version = oldVersion;
+ successCallback(false);
+ });
+
+ uint64_t requestID = request->requestID();
+ m_pendingDatabaseTasks.add(requestID, request.release());
+
+ postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::changeDatabaseVersionInBackingStore, requestID, identifier, newVersion));
+}
+
+void UniqueIDBDatabase::didChangeDatabaseVersion(uint64_t requestID, bool success)
+{
+ RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
+ ASSERT(request);
+
+ request->completeRequest(success);
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::openBackingStoreTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>& objectStoreIDs, WebCore::IndexedDB::TransactionMode mode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="lines">@@ -308,6 +369,16 @@
</span><span class="cx"> postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didCompleteTransactionOperation, identifier, success));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::changeDatabaseVersionInBackingStore(uint64_t requestID, const IDBTransactionIdentifier& identifier, uint64_t newVersion)
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_backingStore);
+
+ bool success = m_backingStore->changeDatabaseVersion(identifier, newVersion);
+
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didChangeDatabaseVersion, requestID, success));
+}
+
</ins><span class="cx"> String UniqueIDBDatabase::absoluteDatabaseDirectory() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -325,6 +396,8 @@
</span><span class="cx">
</span><span class="cx"> m_mainThreadTasks.append(std::move(task));
</span><span class="cx">
</span><ins>+ // Balanced by an adoptRef() in ::performNextMainThreadTask
+ ref();
</ins><span class="cx"> RunLoop::main()->dispatch(bind(&UniqueIDBDatabase::performNextMainThreadTask, this));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -332,10 +405,17 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><ins>+ // Balanced by a ref() in ::postMainThreadTask
+ RefPtr<UniqueIDBDatabase> protector(adoptRef(this));
+
</ins><span class="cx"> std::unique_ptr<AsyncTask> task;
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_mainThreadTaskMutex);
</span><del>- ASSERT(!m_mainThreadTasks.isEmpty());
</del><ins>+
+ // This database might be shutting down, in which case the task queue might be empty.
+ if (m_mainThreadTasks.isEmpty())
+ return;
+
</ins><span class="cx"> task = m_mainThreadTasks.takeFirst();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx"> void resetTransaction(const IDBTransactionIdentifier&, std::function<void(bool)> successCallback);
</span><span class="cx"> void rollbackTransaction(const IDBTransactionIdentifier&, std::function<void(bool)> successCallback);
</span><span class="cx">
</span><ins>+ void changeDatabaseVersion(const IDBTransactionIdentifier&, uint64_t newVersion, std::function<void(bool)> successCallback);
+
</ins><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="cx">
</span><span class="lines">@@ -110,15 +112,22 @@
</span><span class="cx"> void resetBackingStoreTransaction(const IDBTransactionIdentifier&);
</span><span class="cx"> void rollbackBackingStoreTransaction(const IDBTransactionIdentifier&);
</span><span class="cx">
</span><ins>+ void changeDatabaseVersionInBackingStore(uint64_t requestID, const IDBTransactionIdentifier&, uint64_t newVersion);
+
+ void shutdownBackingStore();
+
</ins><span class="cx"> // Callbacks from the database workqueue thread, to be performed on the main thread only
</span><span class="cx"> void performNextMainThreadTask();
</span><span class="cx"> void didOpenBackingStoreAndReadMetadata(const WebCore::IDBDatabaseMetadata&, bool success);
</span><span class="cx"> void didCompleteTransactionOperation(const IDBTransactionIdentifier&, bool success);
</span><ins>+ void didChangeDatabaseVersion(uint64_t requestID, bool success);
+ void didShutdownBackingStore();
</ins><span class="cx">
</span><span class="cx"> bool m_acceptingNewRequests;
</span><span class="cx">
</span><span class="cx"> Deque<RefPtr<AsyncRequest>> m_pendingMetadataRequests;
</span><span class="cx"> HashMap<IDBTransactionIdentifier, RefPtr<AsyncRequest>> m_pendingTransactionRequests;
</span><ins>+ HashMap<uint64_t, RefPtr<AsyncRequest>> m_pendingDatabaseTasks;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::IDBDatabaseMetadata> m_metadata;
</span><span class="cx"> bool m_didGetMetadataFromBackingStore;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> virtual bool commitTransaction(const IDBTransactionIdentifier&) = 0;
</span><span class="cx"> virtual bool resetTransaction(const IDBTransactionIdentifier&) = 0;
</span><span class="cx"> virtual bool rollbackTransaction(const IDBTransactionIdentifier&) = 0;
</span><ins>+
+ virtual bool changeDatabaseVersion(const IDBTransactionIdentifier&, uint64_t newVersion) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -27,33 +27,68 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include <WebCore/IndexedDB.h>
+#include <WebCore/SQLiteTransaction.h>
+
+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-SQLiteIDBTransaction::SQLiteIDBTransaction(const IDBTransactionIdentifier& identifier)
</del><ins>+SQLiteIDBTransaction::SQLiteIDBTransaction(const IDBTransactionIdentifier& identifier, IndexedDB::TransactionMode mode)
</ins><span class="cx"> : m_identifier(identifier)
</span><ins>+ , m_mode(mode)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SQLiteIDBTransaction::begin()
</del><ins>+SQLiteIDBTransaction::~SQLiteIDBTransaction()
</ins><span class="cx"> {
</span><del>- return false;
</del><ins>+ if (inProgress())
+ m_sqliteTransaction->rollback();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
+bool SQLiteIDBTransaction::begin(SQLiteDatabase& database)
+{
+ ASSERT(!m_sqliteTransaction);
+ m_sqliteTransaction = std::make_unique<SQLiteTransaction>(database, m_mode == IndexedDB::TransactionMode::ReadOnly);
+
+ m_sqliteTransaction->begin();
+
+ return m_sqliteTransaction->inProgress();
+}
+
</ins><span class="cx"> bool SQLiteIDBTransaction::commit()
</span><span class="cx"> {
</span><del>- return false;
</del><ins>+ ASSERT(m_sqliteTransaction);
+ if (!m_sqliteTransaction->inProgress())
+ return false;
+
+ m_sqliteTransaction->commit();
+
+ return !m_sqliteTransaction->inProgress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SQLiteIDBTransaction::reset()
</span><span class="cx"> {
</span><del>- return false;
</del><ins>+ m_sqliteTransaction = nullptr;
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SQLiteIDBTransaction::rollback()
</span><span class="cx"> {
</span><del>- return false;
</del><ins>+ ASSERT(m_sqliteTransaction);
+ if (m_sqliteTransaction->inProgress())
+ m_sqliteTransaction->rollback();
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool SQLiteIDBTransaction::inProgress() const
+{
+ return m_sqliteTransaction && m_sqliteTransaction->inProgress();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -31,27 +31,46 @@
</span><span class="cx"> #include "IDBTransactionIdentifier.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+
+class SQLiteDatabase;
+class SQLiteTransaction;
+
+namespace IndexedDB {
+enum class TransactionMode;
+}
+
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class SQLiteIDBTransaction {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SQLiteIDBTransaction);
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<SQLiteIDBTransaction> create(const IDBTransactionIdentifier& identifier)
</del><ins>+ static std::unique_ptr<SQLiteIDBTransaction> create(const IDBTransactionIdentifier& identifier, WebCore::IndexedDB::TransactionMode mode)
</ins><span class="cx"> {
</span><del>- return std::unique_ptr<SQLiteIDBTransaction>(new SQLiteIDBTransaction(identifier));
</del><ins>+ return std::unique_ptr<SQLiteIDBTransaction>(new SQLiteIDBTransaction(identifier, mode));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ ~SQLiteIDBTransaction();
+
</ins><span class="cx"> const IDBTransactionIdentifier& identifier() const { return m_identifier; }
</span><span class="cx">
</span><del>- bool begin();
</del><ins>+ bool begin(WebCore::SQLiteDatabase&);
</ins><span class="cx"> bool commit();
</span><span class="cx"> bool reset();
</span><span class="cx"> bool rollback();
</span><span class="cx">
</span><ins>+ WebCore::IndexedDB::TransactionMode mode() const { return m_mode; }
+ bool inProgress() const;
+
</ins><span class="cx"> private:
</span><del>- SQLiteIDBTransaction(const IDBTransactionIdentifier&);
</del><ins>+ SQLiteIDBTransaction(const IDBTransactionIdentifier&, WebCore::IndexedDB::TransactionMode);
</ins><span class="cx">
</span><span class="cx"> IDBTransactionIdentifier m_identifier;
</span><ins>+ WebCore::IndexedDB::TransactionMode m_mode;
+
+ std::unique_ptr<WebCore::SQLiteTransaction> m_sqliteTransaction;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -66,44 +66,44 @@
</span><span class="cx"> std::unique_ptr<WebCore::IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><del>- ASSERT(m_metadataDB);
- ASSERT(m_metadataDB->isOpen());
</del><ins>+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
</ins><span class="cx">
</span><del>- if (!m_metadataDB->executeCommand("CREATE TABLE IDBDatabaseInfo (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value TEXT NOT NULL ON CONFLICT FAIL);")) {
- LOG_ERROR("Could not create IDBDatabaseInfo table in database (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
- m_metadataDB = nullptr;
</del><ins>+ if (!m_sqliteDB->executeCommand("CREATE TABLE IDBDatabaseInfo (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value TEXT NOT NULL ON CONFLICT FAIL);")) {
+ LOG_ERROR("Could not create IDBDatabaseInfo table in database (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- SQLiteStatement sql(*m_metadataDB, "INSERT INTO IDBDatabaseInfo VALUES ('MetadataVersion', ?);");
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IDBDatabaseInfo VALUES ('MetadataVersion', ?);"));
</ins><span class="cx"> if (sql.prepare() != SQLResultOk
</span><span class="cx"> || sql.bindInt(1, currentMetadataVersion) != SQLResultOk
</span><span class="cx"> || sql.step() != SQLResultDone) {
</span><del>- LOG_ERROR("Could not insert database metadata version into IDBDatabaseInfo table (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
- m_metadataDB = nullptr;
</del><ins>+ LOG_ERROR("Could not insert database metadata version into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> {
</span><del>- SQLiteStatement sql(*m_metadataDB, "INSERT INTO IDBDatabaseInfo VALUES ('DatabaseName', ?);");
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IDBDatabaseInfo VALUES ('DatabaseName', ?);"));
</ins><span class="cx"> if (sql.prepare() != SQLResultOk
</span><span class="cx"> || sql.bindText(1, m_identifier.databaseName()) != SQLResultOk
</span><span class="cx"> || sql.step() != SQLResultDone) {
</span><del>- LOG_ERROR("Could not insert database name into IDBDatabaseInfo table (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
- m_metadataDB = nullptr;
</del><ins>+ LOG_ERROR("Could not insert database name into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> {
</span><span class="cx"> // Database versions are defined to be a uin64_t in the spec but sqlite3 doesn't support native binding of unsigned integers.
</span><span class="cx"> // Therefore we'll store the version as a String.
</span><del>- SQLiteStatement sql(*m_metadataDB, "INSERT INTO IDBDatabaseInfo VALUES ('DatabaseVersion', ?);");
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IDBDatabaseInfo VALUES ('DatabaseVersion', ?);"));
</ins><span class="cx"> if (sql.prepare() != SQLResultOk
</span><span class="cx"> || sql.bindText(1, String::number(0)) != SQLResultOk
</span><span class="cx"> || sql.step() != SQLResultDone) {
</span><del>- LOG_ERROR("Could not insert default version into IDBDatabaseInfo table (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
- m_metadataDB = nullptr;
</del><ins>+ LOG_ERROR("Could not insert default version into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -119,20 +119,20 @@
</span><span class="cx"> std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><del>- ASSERT(m_metadataDB);
</del><ins>+ ASSERT(m_sqliteDB);
</ins><span class="cx">
</span><del>- if (!m_metadataDB->tableExists("IDBDatabaseInfo"))
</del><ins>+ if (!m_sqliteDB->tableExists(ASCIILiteral("IDBDatabaseInfo")))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> auto metadata = std::make_unique<IDBDatabaseMetadata>();
</span><span class="cx"> {
</span><del>- SQLiteStatement sql(*m_metadataDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'MetadataVersion';");
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT value FROM IDBDatabaseInfo WHERE key = 'MetadataVersion';"));
</ins><span class="cx"> if (sql.isColumnNull(0))
</span><span class="cx"> return nullptr;
</span><span class="cx"> metadata->version = sql.getColumnInt(0);
</span><span class="cx"> }
</span><span class="cx"> {
</span><del>- SQLiteStatement sql(*m_metadataDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'DatabaseName';");
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'DatabaseName';");
</ins><span class="cx"> if (sql.isColumnNull(0))
</span><span class="cx"> return nullptr;
</span><span class="cx"> metadata->name = sql.getColumnText(0);
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> {
</span><del>- SQLiteStatement sql(*m_metadataDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'DatabaseVersion';");
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT value FROM IDBDatabaseInfo WHERE key = 'DatabaseVersion';"));
</ins><span class="cx"> if (sql.isColumnNull(0))
</span><span class="cx"> return nullptr;
</span><span class="cx"> String stringVersion = sql.getColumnText(0);
</span><span class="lines">@@ -168,6 +168,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Since a WorkQueue isn't bound to a specific thread, we have to disable threading checks
+ // even though we never access the database from different threads simultaneously.
+ sqliteDatabase->disableThreadingChecks();
+
</ins><span class="cx"> return sqliteDatabase;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,9 +179,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx">
</span><del>- String metadataDBFilename = pathByAppendingComponent(m_absoluteDatabaseDirectory, "IDBMetadata.sqlite3");
- m_metadataDB = openSQLiteDatabaseAtPath(metadataDBFilename);
- if (!m_metadataDB)
</del><ins>+ String dbFilename = pathByAppendingComponent(m_absoluteDatabaseDirectory, "IndexedDB.sqlite3");
+ m_sqliteDB = openSQLiteDatabaseAtPath(dbFilename);
+ if (!m_sqliteDB)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBDatabaseMetadata> metadata = extractExistingMetadata();
</span><span class="lines">@@ -185,7 +189,7 @@
</span><span class="cx"> metadata = createAndPopulateInitialMetadata();
</span><span class="cx">
</span><span class="cx"> if (!metadata)
</span><del>- LOG_ERROR("Unable to establish IDB database at path '%s'", metadataDBFilename.utf8().data());
</del><ins>+ LOG_ERROR("Unable to establish IDB database at path '%s'", dbFilename.utf8().data());
</ins><span class="cx">
</span><span class="cx"> // The database id is a runtime concept and doesn't need to be stored in the metadata database.
</span><span class="cx"> metadata->id = generateDatabaseId();
</span><span class="lines">@@ -193,11 +197,11 @@
</span><span class="cx"> return metadata;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool UniqueIDBDatabaseBackingStoreSQLite::establishTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>&, WebCore::IndexedDB::TransactionMode)
</del><ins>+bool UniqueIDBDatabaseBackingStoreSQLite::establishTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>&, WebCore::IndexedDB::TransactionMode mode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx">
</span><del>- if (!m_transactions.add(identifier, SQLiteIDBTransaction::create(identifier)).isNewEntry) {
</del><ins>+ if (!m_transactions.add(identifier, SQLiteIDBTransaction::create(identifier, mode)).isNewEntry) {
</ins><span class="cx"> LOG_ERROR("Attempt to establish transaction identifier that already exists");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -215,7 +219,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return transaction->begin();
</del><ins>+ return transaction->begin(*m_sqliteDB);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::commitTransaction(const IDBTransactionIdentifier& identifier)
</span><span class="lines">@@ -257,6 +261,35 @@
</span><span class="cx"> return transaction->rollback();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabaseBackingStoreSQLite::changeDatabaseVersion(const IDBTransactionIdentifier& identifier, uint64_t newVersion)
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
+
+ SQLiteIDBTransaction* transaction = m_transactions.get(identifier);
+ if (!transaction || !transaction->inProgress()) {
+ LOG_ERROR("Attempt to change database version with an establish, in-progress transaction");
+ return false;
+ }
+ if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+ LOG_ERROR("Attempt to change database version during a non version-change transaction");
+ return false;
+ }
+
+ {
+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("UPDATE IDBDatabaseInfo SET value = ? where key = 'DatabaseVersion';"));
+ if (sql.prepare() != SQLResultOk
+ || sql.bindText(1, String::number(newVersion)) != SQLResultOk
+ || sql.step() != SQLResultDone) {
+ LOG_ERROR("Could not update database version in IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ return false;
+ }
+ }
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLiteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "UniqueIDBDatabase.h"
</span><span class="cx"> #include "UniqueIDBDatabaseBackingStore.h"
</span><ins>+#include <wtf/OwnPtr.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -59,6 +60,8 @@
</span><span class="cx"> virtual bool resetTransaction(const IDBTransactionIdentifier&) OVERRIDE;
</span><span class="cx"> virtual bool rollbackTransaction(const IDBTransactionIdentifier&) OVERRIDE;
</span><span class="cx">
</span><ins>+ virtual bool changeDatabaseVersion(const IDBTransactionIdentifier&, uint64_t newVersion) OVERRIDE;
+
</ins><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
</span><span class="cx">
</span><span class="lines">@@ -69,7 +72,7 @@
</span><span class="cx"> UniqueIDBDatabaseIdentifier m_identifier;
</span><span class="cx"> String m_absoluteDatabaseDirectory;
</span><span class="cx">
</span><del>- std::unique_ptr<WebCore::SQLiteDatabase> m_metadataDB;
</del><ins>+ std::unique_ptr<WebCore::SQLiteDatabase> m_sqliteDB;
</ins><span class="cx">
</span><span class="cx"> HashMap<IDBTransactionIdentifier, std::unique_ptr<SQLiteIDBTransaction>> m_transactions;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -70,6 +70,9 @@
</span><span class="cx"> WebIDBServerConnection::~WebIDBServerConnection()
</span><span class="cx"> {
</span><span class="cx"> WebProcess::shared().webToDatabaseProcessConnection()->removeWebIDBServerConnection(*this);
</span><ins>+
+ for (const auto& it : m_serverRequests)
+ it.value->requestAborted();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebIDBServerConnection::isClosed()
</span><span class="lines">@@ -295,10 +298,35 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::changeDatabaseVersion(IDBTransactionBackend&, const IDBDatabaseBackend::VersionChangeOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::changeDatabaseVersion(IDBTransactionBackend&, const IDBDatabaseBackend::VersionChangeOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><ins>+ RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
+
+ serverRequest->setAbortHandler([completionCallback]() {
+ completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured changing database version"));
+ });
+
+ uint64_t requestID = serverRequest->requestID();
+ ASSERT(!m_serverRequests.contains(requestID));
+ m_serverRequests.add(requestID, serverRequest.release());
+
+ LOG(IDB, "WebProcess changeDatabaseVersion request ID %llu", requestID);
+
+ send(Messages::DatabaseProcessIDBConnection::ChangeDatabaseVersion(requestID, operation.transaction()->id(), static_cast<uint64_t>(operation.version())));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBServerConnection::didChangeDatabaseVersion(uint64_t requestID, bool success)
+{
+ LOG(IDB, "WebProcess didChangeDatabaseVersion request ID %llu", requestID);
+
+ RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
+
+ if (!serverRequest)
+ return;
+
+ serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured changing database version"));
+}
+
</ins><span class="cx"> void WebIDBServerConnection::cursorAdvance(IDBCursorBackend&, const CursorAdvanceOperation&, std::function<void()> completionCallback)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> void didCommitTransaction(uint64_t requestID, bool success);
</span><span class="cx"> void didResetTransaction(uint64_t requestID, bool success);
</span><span class="cx"> void didRollbackTransaction(uint64_t requestID, bool success);
</span><ins>+ void didChangeDatabaseVersion(uint64_t requestID, bool success);
</ins><span class="cx">
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in (161075 => 161076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2013-12-26 00:09:52 UTC (rev 161075)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2013-12-26 00:29:03 UTC (rev 161076)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> DidCommitTransaction(uint64_t requestID, bool success)
</span><span class="cx"> DidResetTransaction(uint64_t requestID, bool success)
</span><span class="cx"> DidRollbackTransaction(uint64_t requestID, bool success)
</span><ins>+
+ DidChangeDatabaseVersion(uint64_t requestID, bool success)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span></span></pre>
</div>
</div>
</body>
</html>