<!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>[160667] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160667">160667</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 15:23:34 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>DatabaseProcess: Implement openTransaction()
https://bugs.webkit.org/show_bug.cgi?id=125794
Reviewed by Darin Adler.
This patch hooks up all of the necessary infrastructure to open a uniquely
identified transaction in the DatabaseProcess backing store.
The transaction itself is not yet functional.
Add openTransaction messaging to the WebProcess side:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::isClosed):
(WebKit::WebIDBServerConnection::getOrEstablishIDBDatabaseMetadata):
(WebKit::WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata):
(WebKit::WebIDBServerConnection::openTransaction):
(WebKit::WebIDBServerConnection::didOpenTransaction):
(WebKit::WebIDBServerConnection::deleteObjectStore):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:
Add openTransaction messaging to the DatabaseProcess side:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::openTransaction):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
Add a hashable identifier that represents a connection/transactionID pair:
* DatabaseProcess/IndexedDB/IDBTransactionIdentifier.h: Added.
(WebKit::IDBTransactionIdentifier::IDBTransactionIdentifier):
(WebKit::IDBTransactionIdentifier::isolatedCopy):
(WebKit::IDBTransactionIdentifier::isEmpty):
(WebKit::IDBTransactionIdentifier::hash):
(WebKit::IDBTransactionIdentifier::operator==):
(WebKit::IDBTransactionIdentifier::isHashTableDeletedValue):
(WebKit::IDBTransactionIdentifierHash::hash):
(WebKit::IDBTransactionIdentifierHash::equal):
(WebKit::IDBTransactionIdentifierHashTraits::isEmptyValue):
Allow that identifier to be cross-thread copied:
* Shared/WebCrossThreadCopier.cpp:
(WebCore::::copy):
* Shared/WebCrossThreadCopier.h:
Ask the backing store to open this uniquely identified transaction:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::openTransaction):
(WebKit::UniqueIDBDatabase::openBackingStoreTransaction):
(WebKit::UniqueIDBDatabase::didOpenBackingStoreTransaction):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
Add the backing store implementation for opening a transaction:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h:
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::establishTransaction):
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
Object to represent the backing store transaction itself, to be used in future patches:
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp:
(WebKit::SQLiteIDBTransaction::SQLiteIDBTransaction):
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h:
(WebKit::SQLiteIDBTransaction::create):
(WebKit::SQLiteIDBTransaction::identifier):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#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="#trunkSourceWebKit2SharedWebCrossThreadCopiercpp">trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCrossThreadCopierh">trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBIDBTransactionIdentifierh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBTransactionIdentifier.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2013-12-16 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess: Implement openTransaction()
+ https://bugs.webkit.org/show_bug.cgi?id=125794
+
+ Reviewed by Darin Adler.
+
+ This patch hooks up all of the necessary infrastructure to open a uniquely
+ identified transaction in the DatabaseProcess backing store.
+
+ The transaction itself is not yet functional.
+
+ Add openTransaction messaging to the WebProcess side:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::isClosed):
+ (WebKit::WebIDBServerConnection::getOrEstablishIDBDatabaseMetadata):
+ (WebKit::WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata):
+ (WebKit::WebIDBServerConnection::openTransaction):
+ (WebKit::WebIDBServerConnection::didOpenTransaction):
+ (WebKit::WebIDBServerConnection::deleteObjectStore):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:
+
+ Add openTransaction messaging to the DatabaseProcess side:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::openTransaction):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+
+ Add a hashable identifier that represents a connection/transactionID pair:
+ * DatabaseProcess/IndexedDB/IDBTransactionIdentifier.h: Added.
+ (WebKit::IDBTransactionIdentifier::IDBTransactionIdentifier):
+ (WebKit::IDBTransactionIdentifier::isolatedCopy):
+ (WebKit::IDBTransactionIdentifier::isEmpty):
+ (WebKit::IDBTransactionIdentifier::hash):
+ (WebKit::IDBTransactionIdentifier::operator==):
+ (WebKit::IDBTransactionIdentifier::isHashTableDeletedValue):
+ (WebKit::IDBTransactionIdentifierHash::hash):
+ (WebKit::IDBTransactionIdentifierHash::equal):
+ (WebKit::IDBTransactionIdentifierHashTraits::isEmptyValue):
+
+ Allow that identifier to be cross-thread copied:
+ * Shared/WebCrossThreadCopier.cpp:
+ (WebCore::::copy):
+ * Shared/WebCrossThreadCopier.h:
+
+ Ask the backing store to open this uniquely identified transaction:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::openTransaction):
+ (WebKit::UniqueIDBDatabase::openBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::didOpenBackingStoreTransaction):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ Add the backing store implementation for opening a transaction:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h:
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::establishTransaction):
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
+
+ Object to represent the backing store transaction itself, to be used in future patches:
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp:
+ (WebKit::SQLiteIDBTransaction::SQLiteIDBTransaction):
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h:
+ (WebKit::SQLiteIDBTransaction::create):
+ (WebKit::SQLiteIDBTransaction::identifier):
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2013-12-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crash when trying to load a null HTML string
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><ins>+#include "IDBTransactionIdentifier.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">@@ -72,6 +73,16 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcessIDBConnection::openTransaction(uint64_t requestID, int64_t transactionID, int64_t)
+{
+ ASSERT(m_uniqueIDBDatabase);
+
+ RefPtr<DatabaseProcessIDBConnection> connection(this);
+ m_uniqueIDBDatabase->openTransaction(IDBTransactionIdentifier(*this, transactionID), [connection, requestID](bool success) {
+ connection->send(Messages::WebIDBServerConnection::DidOpenTransaction(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 (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void establishConnection(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin);
</span><span class="cx"> void getOrEstablishIDBDatabaseMetadata(uint64_t requestID);
</span><ins>+ void openTransaction(uint64_t requestID, int64_t transactionID, int64_t transactionMode);
</ins><span class="cx">
</span><span class="cx"> Ref<DatabaseToWebProcessConnection> m_connection;
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> messages -> DatabaseProcessIDBConnection LegacyReceiver {
</span><span class="cx"> EstablishConnection(String databaseName, WebKit::SecurityOriginData openingOrigin, WebKit::SecurityOriginData mainFrameOrigin)
</span><span class="cx"> GetOrEstablishIDBDatabaseMetadata(uint64_t requestID)
</span><ins>+ OpenTransaction(uint64_t requestID, int64_t transactionID, int64_t transactionMode)
</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="trunkSourceWebKit2DatabaseProcessIndexedDBIDBTransactionIdentifierh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBTransactionIdentifier.h (0 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBTransactionIdentifier.h (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBTransactionIdentifier.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -0,0 +1,113 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef IDBTransactionIdentifier_h
+#define IDBTransactionIdentifier_h
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include <wtf/HashTraits.h>
+#include <wtf/StringHasher.h>
+
+namespace WebKit {
+
+class DatabaseProcessIDBConnection;
+
+class IDBTransactionIdentifier {
+public:
+ IDBTransactionIdentifier()
+ : m_connection(nullptr)
+ , m_transactionID(0)
+ {
+ }
+
+ IDBTransactionIdentifier(DatabaseProcessIDBConnection& connection, int64_t transactionID)
+ : m_connection(&connection)
+ , m_transactionID(transactionID)
+ {
+ }
+
+ IDBTransactionIdentifier isolatedCopy() const
+ {
+ return *this;
+ }
+
+ bool isEmpty() const
+ {
+ return !m_connection && !m_transactionID;
+ }
+
+ unsigned hash() const
+ {
+ uint64_t hashCodes[2] = { reinterpret_cast<uint64_t>(m_connection), static_cast<uint64_t>(m_transactionID) };
+ return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
+ }
+
+ bool operator==(const IDBTransactionIdentifier& other) const
+ {
+ return m_connection == other.m_connection && m_transactionID == other.m_transactionID;
+ }
+
+ IDBTransactionIdentifier(WTF::HashTableDeletedValueType)
+ : m_connection(nullptr)
+ , m_transactionID(-1)
+ {
+ }
+
+ bool isHashTableDeletedValue() const
+ {
+ return !m_connection && m_transactionID == -1;
+ }
+
+private:
+ // If any members are added that cannot be safely copied across threads, isolatedCopy() must be updated.
+ DatabaseProcessIDBConnection* m_connection;
+ int64_t m_transactionID;
+};
+
+struct IDBTransactionIdentifierHash {
+ static unsigned hash(const IDBTransactionIdentifier& a) { return a.hash(); }
+ static bool equal(const IDBTransactionIdentifier& a, const IDBTransactionIdentifier& b) { return a == b; }
+ static const bool safeToCompareToEmptyOrDeleted = false;
+};
+
+struct IDBTransactionIdentifierHashTraits : WTF::SimpleClassHashTraits<IDBTransactionIdentifier> {
+ static const bool hasIsEmptyValueFunction = true;
+ static bool isEmptyValue(const IDBTransactionIdentifier& info) { return info.isEmpty(); }
+};
+
+} // namespace WebKit
+
+namespace WTF {
+
+template<> struct HashTraits<WebKit::IDBTransactionIdentifier> : WebKit::IDBTransactionIdentifierHashTraits { };
+template<> struct DefaultHash<WebKit::IDBTransactionIdentifier> {
+ typedef WebKit::IDBTransactionIdentifierHash Hash;
+};
+
+} // namespace WTF
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // IDBTransactionIdentifier_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -196,6 +196,48 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::openTransaction(const IDBTransactionIdentifier& identifier, std::function<void(bool)> successCallback)
+{
+ ASSERT(isMainThread());
+
+ if (!m_acceptingNewRequests) {
+ successCallback(false);
+ return;
+ }
+
+ postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::openBackingStoreTransaction, identifier));
+
+ RefPtr<AsyncRequest> request = AsyncRequestImpl<bool>::create([successCallback](bool success) {
+ successCallback(success);
+ }, [successCallback]() {
+ successCallback(false);
+ });
+
+ m_pendingOpenTransactionRequests.set(identifier, request.release());
+}
+
+void UniqueIDBDatabase::openBackingStoreTransaction(const IDBTransactionIdentifier& identifier)
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_backingStore);
+
+ bool success = m_backingStore->establishTransaction(identifier);
+
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didOpenBackingStoreTransaction, identifier, success));
+}
+
+void UniqueIDBDatabase::didOpenBackingStoreTransaction(const IDBTransactionIdentifier& identifier, bool success)
+{
+ ASSERT(isMainThread());
+
+ RefPtr<AsyncRequest> request = m_pendingOpenTransactionRequests.take(identifier);
+
+ if (!request)
+ return;
+
+ request->completeRequest(success);
+}
+
</ins><span class="cx"> String UniqueIDBDatabase::absoluteDatabaseDirectory() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "IDBTransactionIdentifier.h"
</ins><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="lines">@@ -64,6 +65,7 @@
</span><span class="cx"> void unregisterConnection(DatabaseProcessIDBConnection&);
</span><span class="cx">
</span><span class="cx"> void getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const WebCore::IDBDatabaseMetadata&)> completionCallback);
</span><ins>+ void openTransaction(const IDBTransactionIdentifier&, std::function<void(bool)> successCallback);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="lines">@@ -94,14 +96,18 @@
</span><span class="cx"> void performNextDatabaseTask();
</span><span class="cx"> void postMainThreadTask(std::unique_ptr<AsyncTask>);
</span><span class="cx"> void openBackingStoreAndReadMetadata(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
</span><ins>+ void openBackingStoreTransaction(const IDBTransactionIdentifier&);
</ins><span class="cx">
</span><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><ins>+ void didOpenBackingStoreTransaction(const IDBTransactionIdentifier&, bool success);
</ins><span class="cx">
</span><del>- Deque<RefPtr<AsyncRequest>> m_pendingMetadataRequests;
</del><span class="cx"> bool m_acceptingNewRequests;
</span><span class="cx">
</span><ins>+ Deque<RefPtr<AsyncRequest>> m_pendingMetadataRequests;
+ HashMap<IDBTransactionIdentifier, RefPtr<AsyncRequest>> m_pendingOpenTransactionRequests;
+
</ins><span class="cx"> std::unique_ptr<WebCore::IDBDatabaseMetadata> m_metadata;
</span><span class="cx"> bool m_didGetMetadataFromBackingStore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -36,11 +36,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class IDBTransactionIdentifier;
+
</ins><span class="cx"> class UniqueIDBDatabaseBackingStore : public RefCounted<UniqueIDBDatabaseBackingStore> {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~UniqueIDBDatabaseBackingStore() { }
</span><span class="cx">
</span><span class="cx"> virtual std::unique_ptr<WebCore::IDBDatabaseMetadata> getOrEstablishMetadata() = 0;
</span><ins>+ virtual bool establishTransaction(const IDBTransactionIdentifier&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBTransactioncppfromrev160665trunkSourceWebKit2SharedWebCrossThreadCopiercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp (from rev 160665, trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp) (0 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "config.h"
+#include "SQLiteIDBTransaction.h"
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+namespace WebKit {
+
+SQLiteIDBTransaction::SQLiteIDBTransaction(const IDBTransactionIdentifier& identifier)
+ : m_identifier(identifier)
+{
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBTransactionhfromrev160665trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStoreh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h (from rev 160665, trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h) (0 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SQLiteIDBTransaction_h
+#define SQLiteIDBTransaction_h
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include "IDBTransactionIdentifier.h"
+#include <wtf/Noncopyable.h>
+
+namespace WebKit {
+
+class SQLiteIDBTransaction {
+ WTF_MAKE_NONCOPYABLE(SQLiteIDBTransaction);
+public:
+ static std::unique_ptr<SQLiteIDBTransaction> create(const IDBTransactionIdentifier& identifier)
+ {
+ return std::unique_ptr<SQLiteIDBTransaction>(new SQLiteIDBTransaction(identifier));
+ }
+
+ const IDBTransactionIdentifier& identifier() const { return m_identifier; }
+
+private:
+ SQLiteIDBTransaction(const IDBTransactionIdentifier&);
+
+ IDBTransactionIdentifier m_identifier;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // SQLiteIDBTransaction_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "SQLiteIDBTransaction.h"
</ins><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="lines">@@ -57,6 +58,11 @@
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite()
+{
+ ASSERT(!isMainThread());
+}
+
</ins><span class="cx"> std::unique_ptr<WebCore::IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="lines">@@ -187,6 +193,16 @@
</span><span class="cx"> return metadata;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool UniqueIDBDatabaseBackingStoreSQLite::establishTransaction(const IDBTransactionIdentifier& identifier)
+{
+ ASSERT(!isMainThread());
+ ASSERT(!m_transactions.contains(identifier));
+
+ m_transactions.add(identifier, SQLiteIDBTransaction::create(identifier));
+
+ 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 (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class SQLiteIDBTransaction;
+
</ins><span class="cx"> class UniqueIDBDatabaseBackingStoreSQLite FINAL : public UniqueIDBDatabaseBackingStore {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<UniqueIDBDatabaseBackingStore> create(const UniqueIDBDatabaseIdentifier& identifier, const String& databaseDirectory)
</span><span class="lines">@@ -47,7 +49,10 @@
</span><span class="cx"> return adoptRef(new UniqueIDBDatabaseBackingStoreSQLite(identifier, databaseDirectory));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual ~UniqueIDBDatabaseBackingStoreSQLite();
+
</ins><span class="cx"> virtual std::unique_ptr<WebCore::IDBDatabaseMetadata> getOrEstablishMetadata() OVERRIDE;
</span><ins>+ virtual bool establishTransaction(const IDBTransactionIdentifier&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
</span><span class="lines">@@ -60,6 +65,8 @@
</span><span class="cx"> String m_absoluteDatabaseDirectory;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::SQLiteDatabase> m_metadataDB;
</span><ins>+
+ HashMap<IDBTransactionIdentifier, std::unique_ptr<SQLiteIDBTransaction>> m_transactions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+#include "IDBTransactionIdentifier.h"
</ins><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -38,6 +39,11 @@
</span><span class="cx"> return identifier.isolatedCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBTransactionIdentifier CrossThreadCopierBase<false, false, IDBTransactionIdentifier>::copy(const IDBTransactionIdentifier& identifier)
+{
+ return identifier.isolatedCopy();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><ins>+class IDBTransactionIdentifier;
</ins><span class="cx"> class UniqueIDBDatabaseIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -40,6 +41,10 @@
</span><span class="cx"> static WebKit::UniqueIDBDatabaseIdentifier copy(const WebKit::UniqueIDBDatabaseIdentifier&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct CrossThreadCopierBase<false, false, WebKit::IDBTransactionIdentifier> {
+ static WebKit::IDBTransactionIdentifier copy(const WebKit::IDBTransactionIdentifier&);
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -526,6 +526,8 @@
</span><span class="cx"> 511B24A7132E095700065A0C /* WebIconDatabaseProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B24A5132E095700065A0C /* WebIconDatabaseProxy.h */; };
</span><span class="cx"> 511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511B24A8132E097200065A0C /* WebIconDatabase.cpp */; };
</span><span class="cx"> 511B24AB132E097200065A0C /* WebIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B24A9132E097200065A0C /* WebIconDatabase.h */; };
</span><ins>+ 511D81FF185BBDEE001AED56 /* SQLiteIDBTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 511D81FD185BBDEE001AED56 /* SQLiteIDBTransaction.h */; };
+ 511D8201185BC217001AED56 /* SQLiteIDBTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511D8200185BC217001AED56 /* SQLiteIDBTransaction.cpp */; };
</ins><span class="cx"> 511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */; };
</span><span class="cx"> 511F8A81138B485D00A95F44 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
</span><span class="cx"> 51217460164C20E30037A5C1 /* ShareableResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5121745E164C20E30037A5C1 /* ShareableResource.cpp */; };
</span><span class="lines">@@ -679,6 +681,7 @@
</span><span class="cx"> 51D130551382EAC000351EDD /* SecItemResponseData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D130511382EAC000351EDD /* SecItemResponseData.cpp */; };
</span><span class="cx"> 51D130561382EAC000351EDD /* SecItemResponseData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D130521382EAC000351EDD /* SecItemResponseData.h */; };
</span><span class="cx"> 51D130581382F10500351EDD /* WebProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D130571382F10500351EDD /* WebProcessProxyMac.mm */; };
</span><ins>+ 51D54A73185BAC42000CAED2 /* IDBTransactionIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D54A72185BAC42000CAED2 /* IDBTransactionIdentifier.h */; };
</ins><span class="cx"> 51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51DD9F2616367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp */; };
</span><span class="cx"> 51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */; };
</span><span class="cx"> 51E351CA180F2CCC00E53BE9 /* IDBUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */; };
</span><span class="lines">@@ -2113,6 +2116,8 @@
</span><span class="cx"> 511B24A5132E095700065A0C /* WebIconDatabaseProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIconDatabaseProxy.h; path = IconDatabase/WebIconDatabaseProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 511B24A8132E097200065A0C /* WebIconDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 511B24A9132E097200065A0C /* WebIconDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabase.h; sourceTree = "<group>"; };
</span><ins>+ 511D81FD185BBDEE001AED56 /* SQLiteIDBTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteIDBTransaction.h; sourceTree = "<group>"; };
+ 511D8200185BC217001AED56 /* SQLiteIDBTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteIDBTransaction.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecItemShimLibrary.h; path = ../../WebProcess/mac/SecItemShimLibrary.h; sourceTree = "<group>"; };
</span><span class="cx"> 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SecItemShimLibrary.mm; path = ../../WebProcess/mac/SecItemShimLibrary.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5121745E164C20E30037A5C1 /* ShareableResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableResource.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2275,6 +2280,7 @@
</span><span class="cx"> 51D130511382EAC000351EDD /* SecItemResponseData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecItemResponseData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51D130521382EAC000351EDD /* SecItemResponseData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemResponseData.h; sourceTree = "<group>"; };
</span><span class="cx"> 51D130571382F10500351EDD /* WebProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessProxyMac.mm; sourceTree = "<group>"; };
</span><ins>+ 51D54A72185BAC42000CAED2 /* IDBTransactionIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBTransactionIdentifier.h; sourceTree = "<group>"; };
</ins><span class="cx"> 51DD9F2616367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkConnectionToWebProcessMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkConnectionToWebProcessMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 51E351C8180F2CCC00E53BE9 /* IDBUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBUtilities.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4112,6 +4118,8 @@
</span><span class="cx"> 51654EF0184EF241007DC837 /* sqlite */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 511D8200185BC217001AED56 /* SQLiteIDBTransaction.cpp */,
+ 511D81FD185BBDEE001AED56 /* SQLiteIDBTransaction.h */,
</ins><span class="cx"> 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */,
</span><span class="cx"> 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -4246,6 +4254,7 @@
</span><span class="cx"> 51D0D42E183B34130097041D /* DatabaseProcessIDBConnection.cpp */,
</span><span class="cx"> 51D0D42F183B34130097041D /* DatabaseProcessIDBConnection.h */,
</span><span class="cx"> 51D0D430183B34130097041D /* DatabaseProcessIDBConnection.messages.in */,
</span><ins>+ 51D54A72185BAC42000CAED2 /* IDBTransactionIdentifier.h */,
</ins><span class="cx"> 515E772D184015800007203F /* UniqueIDBDatabase.cpp */,
</span><span class="cx"> 515E772E184015800007203F /* UniqueIDBDatabase.h */,
</span><span class="cx"> 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */,
</span><span class="lines">@@ -5943,6 +5952,7 @@
</span><span class="cx"> 1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
</span><span class="cx"> 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
</span><span class="cx"> 296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
</span><ins>+ 511D81FF185BBDEE001AED56 /* SQLiteIDBTransaction.h in Headers */,
</ins><span class="cx"> 1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
</span><span class="cx"> 1AA417CB12C00CCA002BE67B /* TextChecker.h in Headers */,
</span><span class="cx"> 1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */,
</span><span class="lines">@@ -6099,6 +6109,7 @@
</span><span class="cx"> 1AC8702D130B49A2002C1257 /* WebPluginSiteDataManager.h in Headers */,
</span><span class="cx"> BCB9F8B01124E07700A137E0 /* WebPolicyClient.h in Headers */,
</span><span class="cx"> BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
</span><ins>+ 51D54A73185BAC42000CAED2 /* IDBTransactionIdentifier.h in Headers */,
</ins><span class="cx"> D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
</span><span class="cx"> BC574E631267D080006F0F12 /* WebPopupMenuProxy.h in Headers */,
</span><span class="cx"> BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */,
</span><span class="lines">@@ -7438,6 +7449,7 @@
</span><span class="cx"> 31A2EC4D148997C200810D71 /* WebNotificationProvider.cpp in Sources */,
</span><span class="cx"> BC857FB612B830E600EDEB2E /* WebOpenPanelParameters.cpp in Sources */,
</span><span class="cx"> BC857F8612B82D0B00EDEB2E /* WebOpenPanelResultListener.cpp in Sources */,
</span><ins>+ 511D8201185BC217001AED56 /* SQLiteIDBTransaction.cpp in Sources */,
</ins><span class="cx"> BC857F7E12B82CEE00EDEB2E /* WebOpenPanelResultListenerProxy.cpp in Sources */,
</span><span class="cx"> BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */,
</span><span class="cx"> 5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebIDBServerConnection::isClosed()
</span><span class="cx"> {
</span><ins>+ // FIXME: Return real value here.
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,7 +92,8 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> uint64_t requestID = serverRequest->requestID();
</span><del>- m_serverRequests.set(requestID, serverRequest.release());
</del><ins>+ ASSERT(!m_serverRequests.contains(requestID));
+ m_serverRequests.add(requestID, serverRequest.release());
</ins><span class="cx">
</span><span class="cx"> send(Messages::DatabaseProcessIDBConnection::GetOrEstablishIDBDatabaseMetadata(requestID));
</span><span class="cx"> }
</span><span class="lines">@@ -99,8 +101,10 @@
</span><span class="cx"> void WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, const IDBDatabaseMetadata& metadata)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
</span><del>- ASSERT(serverRequest);
</del><span class="cx">
</span><ins>+ if (!serverRequest)
+ return;
+
</ins><span class="cx"> serverRequest->completeRequest(metadata, success);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,10 +112,31 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::openTransaction(int64_t transactionID, const HashSet<int64_t>& objectStoreIds, IndexedDB::TransactionMode, BoolCallbackFunction successCallback)
</del><ins>+void WebIDBServerConnection::openTransaction(int64_t transactionID, const HashSet<int64_t>&, IndexedDB::TransactionMode mode, BoolCallbackFunction successCallback)
</ins><span class="cx"> {
</span><ins>+ RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<bool>::create(successCallback);
+
+ serverRequest->setAbortHandler([successCallback]() {
+ successCallback(false);
+ });
+
+ uint64_t requestID = serverRequest->requestID();
+ ASSERT(!m_serverRequests.contains(requestID));
+ m_serverRequests.add(requestID, serverRequest.release());
+
+ send(Messages::DatabaseProcessIDBConnection::OpenTransaction(requestID, transactionID, mode));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBServerConnection::didOpenTransaction(uint64_t requestID, bool success)
+{
+ RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
+
+ if (!serverRequest)
+ return;
+
+ serverRequest->completeRequest(success);
+}
+
</ins><span class="cx"> void WebIDBServerConnection::beginTransaction(int64_t transactionID, std::function<void()> completionCallback)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -170,8 +195,8 @@
</span><span class="cx">
</span><span class="cx"> void WebIDBServerConnection::deleteObjectStore(IDBTransactionBackend&, const DeleteObjectStoreOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</span><span class="cx"> {
</span><ins>+}
</ins><span class="cx">
</span><del>-}
</del><span class="cx"> void WebIDBServerConnection::changeDatabaseVersion(IDBTransactionBackend&, const IDBDatabaseBackend::VersionChangeOperation&, std::function<void(PassRefPtr<IDBDatabaseError>)> 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 (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> virtual CoreIPC::Connection* messageSenderConnection() OVERRIDE;
</span><span class="cx">
</span><span class="cx"> void didGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, const WebCore::IDBDatabaseMetadata&);
</span><ins>+ void didOpenTransaction(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 (160666 => 160667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2013-12-16 22:59:59 UTC (rev 160666)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2013-12-16 23:23:34 UTC (rev 160667)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> messages -> WebIDBServerConnection LegacyReceiver {
</span><span class="cx"> DidGetOrEstablishIDBDatabaseMetadata(uint64_t requestID, bool success, WebCore::IDBDatabaseMetadata metadata)
</span><ins>+ DidOpenTransaction(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>