<!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>[196771] 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/196771">196771</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-18 12:23:51 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Implement client->server operations in WK2.
https://bugs.webkit.org/show_bug.cgi?id=154400
Reviewed by Alex Christensen.
No change in behavior yet; Just laying the groundwork.
Source/WebCore:
* Modules/indexeddb/server/IDBServer.h:
* Modules/indexeddb/server/UniqueIDBDatabase.h:
* Modules/indexeddb/shared/IDBIndexInfo.h:
* Modules/indexeddb/shared/IDBObjectStoreInfo.h:
Source/WebKit2:
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::idbServer):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseToWebProcessConnection.cpp:
(WebKit::DatabaseToWebProcessConnection::didReceiveMessage):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
(WebKit::WebIDBConnectionToClient::deleteDatabase):
(WebKit::WebIDBConnectionToClient::openDatabase):
(WebKit::WebIDBConnectionToClient::abortTransaction):
(WebKit::WebIDBConnectionToClient::commitTransaction):
(WebKit::WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction):
(WebKit::WebIDBConnectionToClient::createObjectStore):
(WebKit::WebIDBConnectionToClient::deleteObjectStore):
(WebKit::WebIDBConnectionToClient::clearObjectStore):
(WebKit::WebIDBConnectionToClient::createIndex):
(WebKit::WebIDBConnectionToClient::deleteIndex):
(WebKit::WebIDBConnectionToClient::putOrAdd):
(WebKit::WebIDBConnectionToClient::getRecord):
(WebKit::WebIDBConnectionToClient::getCount):
(WebKit::WebIDBConnectionToClient::deleteRecord):
(WebKit::WebIDBConnectionToClient::openCursor):
(WebKit::WebIDBConnectionToClient::iterateCursor):
(WebKit::WebIDBConnectionToClient::establishTransaction):
(WebKit::WebIDBConnectionToClient::databaseConnectionClosed):
(WebKit::WebIDBConnectionToClient::abortOpenAndUpgradeNeeded):
(WebKit::WebIDBConnectionToClient::didFireVersionChangeEvent):
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServerh">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp</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="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClienth">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientmessagesin">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.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 (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebCore/ChangeLog 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Implement client->server operations in WK2.
+ https://bugs.webkit.org/show_bug.cgi?id=154400
+
+ Reviewed by Alex Christensen.
+
+ No change in behavior yet; Just laying the groundwork.
+
+ * Modules/indexeddb/server/IDBServer.h:
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+ * Modules/indexeddb/shared/IDBIndexInfo.h:
+ * Modules/indexeddb/shared/IDBObjectStoreInfo.h:
+
</ins><span class="cx"> 2016-02-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Unforgeable] operations should not be writable as per Web IDL
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -51,33 +51,33 @@
</span><span class="cx"> class IDBServer : public RefCounted<IDBServer> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<IDBServer> create();
</span><del>- static Ref<IDBServer> create(const String& databaseDirectoryPath);
</del><ins>+ WEBCORE_EXPORT static Ref<IDBServer> create(const String& databaseDirectoryPath);
</ins><span class="cx">
</span><span class="cx"> void registerConnection(IDBConnectionToClient&);
</span><span class="cx"> void unregisterConnection(IDBConnectionToClient&);
</span><span class="cx">
</span><span class="cx"> // Operations requested by the client.
</span><del>- void openDatabase(const IDBRequestData&);
- void deleteDatabase(const IDBRequestData&);
- void abortTransaction(const IDBResourceIdentifier&);
- void commitTransaction(const IDBResourceIdentifier&);
- void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&);
- void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&);
- void deleteObjectStore(const IDBRequestData&, const String& objectStoreName);
- void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier);
- void createIndex(const IDBRequestData&, const IDBIndexInfo&);
- void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
- void putOrAdd(const IDBRequestData&, const IDBKeyData&, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode);
- void getRecord(const IDBRequestData&, const IDBKeyRangeData&);
- void getCount(const IDBRequestData&, const IDBKeyRangeData&);
- void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&);
- void openCursor(const IDBRequestData&, const IDBCursorInfo&);
- void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count);
</del><ins>+ WEBCORE_EXPORT void openDatabase(const IDBRequestData&);
+ WEBCORE_EXPORT void deleteDatabase(const IDBRequestData&);
+ WEBCORE_EXPORT void abortTransaction(const IDBResourceIdentifier&);
+ WEBCORE_EXPORT void commitTransaction(const IDBResourceIdentifier&);
+ WEBCORE_EXPORT void didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&);
+ WEBCORE_EXPORT void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&);
+ WEBCORE_EXPORT void deleteObjectStore(const IDBRequestData&, const String& objectStoreName);
+ WEBCORE_EXPORT void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier);
+ WEBCORE_EXPORT void createIndex(const IDBRequestData&, const IDBIndexInfo&);
+ WEBCORE_EXPORT void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
+ WEBCORE_EXPORT void putOrAdd(const IDBRequestData&, const IDBKeyData&, const ThreadSafeDataBuffer& valueData, IndexedDB::ObjectStoreOverwriteMode);
+ WEBCORE_EXPORT void getRecord(const IDBRequestData&, const IDBKeyRangeData&);
+ WEBCORE_EXPORT void getCount(const IDBRequestData&, const IDBKeyRangeData&);
+ WEBCORE_EXPORT void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&);
+ WEBCORE_EXPORT void openCursor(const IDBRequestData&, const IDBCursorInfo&);
+ WEBCORE_EXPORT void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count);
</ins><span class="cx">
</span><del>- void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
- void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
- void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier);
- void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier);
</del><ins>+ WEBCORE_EXPORT void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&);
+ WEBCORE_EXPORT void databaseConnectionClosed(uint64_t databaseConnectionIdentifier);
+ WEBCORE_EXPORT void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier);
+ WEBCORE_EXPORT void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier);
</ins><span class="cx">
</span><span class="cx"> void postDatabaseTask(std::unique_ptr<CrossThreadTask>&&);
</span><span class="cx"> void postDatabaseTaskReply(std::unique_ptr<CrossThreadTask>&&);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return adoptRef(*new UniqueIDBDatabase(server, identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ~UniqueIDBDatabase();
</del><ins>+ WEBCORE_EXPORT ~UniqueIDBDatabase();
</ins><span class="cx">
</span><span class="cx"> void openDatabaseConnection(IDBConnectionToClient&, const IDBRequestData&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class IDBIndexInfo {
</span><span class="cx"> public:
</span><del>- IDBIndexInfo();
</del><ins>+ WEBCORE_EXPORT IDBIndexInfo();
</ins><span class="cx"> IDBIndexInfo(uint64_t identifier, uint64_t objectStoreIdentifier, const String& name, const IDBKeyPath&, bool unique, bool multiEntry);
</span><span class="cx">
</span><span class="cx"> IDBIndexInfo isolatedCopy() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBObjectStoreInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBObjectStoreInfo.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class IDBObjectStoreInfo {
</span><span class="cx"> public:
</span><del>- IDBObjectStoreInfo();
</del><ins>+ WEBCORE_EXPORT IDBObjectStoreInfo();
</ins><span class="cx"> IDBObjectStoreInfo(uint64_t identifier, const String& name, const IDBKeyPath&, bool autoIncrement);
</span><span class="cx">
</span><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-02-18 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Implement client->server operations in WK2.
+ https://bugs.webkit.org/show_bug.cgi?id=154400
+
+ Reviewed by Alex Christensen.
+
+ No change in behavior yet; Just laying the groundwork.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::idbServer):
+ * DatabaseProcess/DatabaseProcess.h:
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::didReceiveMessage):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ (WebKit::WebIDBConnectionToClient::deleteDatabase):
+ (WebKit::WebIDBConnectionToClient::openDatabase):
+ (WebKit::WebIDBConnectionToClient::abortTransaction):
+ (WebKit::WebIDBConnectionToClient::commitTransaction):
+ (WebKit::WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction):
+ (WebKit::WebIDBConnectionToClient::createObjectStore):
+ (WebKit::WebIDBConnectionToClient::deleteObjectStore):
+ (WebKit::WebIDBConnectionToClient::clearObjectStore):
+ (WebKit::WebIDBConnectionToClient::createIndex):
+ (WebKit::WebIDBConnectionToClient::deleteIndex):
+ (WebKit::WebIDBConnectionToClient::putOrAdd):
+ (WebKit::WebIDBConnectionToClient::getRecord):
+ (WebKit::WebIDBConnectionToClient::getCount):
+ (WebKit::WebIDBConnectionToClient::deleteRecord):
+ (WebKit::WebIDBConnectionToClient::openCursor):
+ (WebKit::WebIDBConnectionToClient::iterateCursor):
+ (WebKit::WebIDBConnectionToClient::establishTransaction):
+ (WebKit::WebIDBConnectionToClient::databaseConnectionClosed):
+ (WebKit::WebIDBConnectionToClient::abortOpenAndUpgradeNeeded):
+ (WebKit::WebIDBConnectionToClient::didFireVersionChangeEvent):
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h:
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in:
+
</ins><span class="cx"> 2016-02-18 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK][Threaded Compositor] The web inspector doesn't work when using the threaded compositor
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -115,6 +115,14 @@
</span><span class="cx">
</span><span class="cx"> m_idbDatabases.remove(identifier);
</span><span class="cx"> }
</span><ins>+
+IDBServer::IDBServer& DatabaseProcess::idbServer()
+{
+ if (!m_idbServer)
+ m_idbServer = IDBServer::IDBServer::create(indexedDatabaseDirectory());
+
+ return *m_idbServer;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::initializeDatabaseProcess(const DatabaseProcessCreationParameters& parameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -29,7 +29,10 @@
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "ChildProcess.h"
</span><ins>+#include "LegacyUniqueIDBDatabase.h"
</ins><span class="cx"> #include "LegacyUniqueIDBDatabaseIdentifier.h"
</span><ins>+#include <WebCore/IDBServer.h>
+#include <WebCore/UniqueIDBDatabase.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -41,7 +44,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><del>-class LegacyUniqueIDBDatabase;
</del><span class="cx">
</span><span class="cx"> struct DatabaseProcessCreationParameters;
</span><span class="cx">
</span><span class="lines">@@ -60,6 +62,8 @@
</span><span class="cx">
</span><span class="cx"> void ensureIndexedDatabaseRelativePathExists(const String&);
</span><span class="cx"> String absoluteIndexedDatabasePathFromDatabaseRelativePath(const String&);
</span><ins>+
+ WebCore::IDBServer::IDBServer& idbServer();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WorkQueue& queue() { return m_queue.get(); }
</span><span class="lines">@@ -110,6 +114,8 @@
</span><span class="cx"> String m_indexedDatabaseDirectory;
</span><span class="cx">
</span><span class="cx"> HashMap<LegacyUniqueIDBDatabaseIdentifier, RefPtr<LegacyUniqueIDBDatabase>> m_idbDatabases;
</span><ins>+
+ RefPtr<WebCore::IDBServer::IDBServer> m_idbServer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Deque<std::unique_ptr<WebCore::CrossThreadTask>> m_databaseTasks;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "DatabaseToWebProcessConnectionMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "WebIDBConnectionToClient.h"
</span><ins>+#include "WebIDBConnectionToClientMessages.h"
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="lines">@@ -62,6 +63,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><ins>+ if (decoder.messageReceiverName() == Messages::WebIDBConnectionToClient::messageReceiverName()) {
+ auto iterator = m_webIDBConnections.find(decoder.destinationID());
+ if (iterator != m_webIDBConnections.end())
+ iterator->value->didReceiveMessage(connection, decoder);
+ return;
+ }
+
</ins><span class="cx"> if (decoder.messageReceiverName() == Messages::DatabaseProcessIDBConnection::messageReceiverName()) {
</span><span class="cx"> IDBConnectionMap::iterator backendIterator = m_idbConnections.find(decoder.destinationID());
</span><span class="cx"> if (backendIterator != m_idbConnections.end())
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><span class="cx"> #include "IDBIdentifier.h"
</span><ins>+#include "LegacyUniqueIDBDatabase.h"
</ins><span class="cx"> #include "Logging.h"
</span><del>-#include "LegacyUniqueIDBDatabase.h"
</del><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebIDBServerConnectionMessages.h"
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "DatabaseProcessIDBConnectionMessages.h"
</span><ins>+#include "LegacyUniqueIDBDatabase.h"
</ins><span class="cx"> #include "LegacyUniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <WebCore/SecurityOriginData.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -43,7 +44,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><del>-class LegacyUniqueIDBDatabase;
</del><span class="cx">
</span><span class="cx"> class DatabaseProcessIDBConnection : public RefCounted<DatabaseProcessIDBConnection>, public IPC::MessageSender {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -28,10 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+#include "DataReference.h"
+#include "DatabaseProcess.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebIDBConnectionToServerMessages.h"
</span><span class="cx"> #include <WebCore/IDBError.h>
</span><span class="cx"> #include <WebCore/IDBResultData.h>
</span><ins>+#include <WebCore/ThreadSafeDataBuffer.h>
</ins><span class="cx"> #include <WebCore/UniqueIDBDatabaseConnection.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -158,84 +161,115 @@
</span><span class="cx"> send(Messages::WebIDBConnectionToServer::NotifyOpenDBRequestBlocked(requestIdentifier, oldVersion, newVersion));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData&)
</del><ins>+void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData& request)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().deleteDatabase(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::openDatabase(const IDBRequestData&)
</del><ins>+void WebIDBConnectionToClient::openDatabase(const IDBRequestData& request)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().openDatabase(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::abortTransaction(const IDBResourceIdentifier&)
</del><ins>+void WebIDBConnectionToClient::abortTransaction(const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().abortTransaction(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::commitTransaction(const IDBResourceIdentifier&)
</del><ins>+void WebIDBConnectionToClient::commitTransaction(const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().commitTransaction(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier&)
</del><ins>+void WebIDBConnectionToClient::didFinishHandlingVersionChangeTransaction(const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().didFinishHandlingVersionChangeTransaction(transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&)
</del><ins>+void WebIDBConnectionToClient::createObjectStore(const IDBRequestData& request, const IDBObjectStoreInfo& info)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().createObjectStore(request, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::deleteObjectStore(const IDBRequestData&, const String&)
</del><ins>+void WebIDBConnectionToClient::deleteObjectStore(const IDBRequestData& request, const String& name)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().deleteObjectStore(request, name);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::clearObjectStore(const IDBRequestData&, uint64_t)
</del><ins>+void WebIDBConnectionToClient::clearObjectStore(const IDBRequestData& request, uint64_t objectStoreIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().clearObjectStore(request, objectStoreIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::createIndex(const IDBRequestData&, const IDBIndexInfo&)
</del><ins>+void WebIDBConnectionToClient::createIndex(const IDBRequestData& request, const IDBIndexInfo& info)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().createIndex(request, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::deleteIndex(const IDBRequestData&, uint64_t, const String&)
</del><ins>+void WebIDBConnectionToClient::deleteIndex(const IDBRequestData& request, uint64_t objectStoreIdentifier, const String& name)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().deleteIndex(request, objectStoreIdentifier, name);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::putOrAdd(const IDBRequestData&, const IDBKeyData&, const IPC::DataReference&, bool)
</del><ins>+void WebIDBConnectionToClient::putOrAdd(const IDBRequestData& request, const IDBKeyData& key, const IPC::DataReference& data, unsigned overwriteMode)
</ins><span class="cx"> {
</span><ins>+ if (overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::NoOverwrite)
+ && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::Overwrite)
+ && overwriteMode != static_cast<unsigned>(IndexedDB::ObjectStoreOverwriteMode::OverwriteForCursor)) {
+ // FIXME: This message from the WebProcess is corrupt.
+ // The DatabaseProcess should return early at this point, but can we also kill the bad WebProcess?
+ return;
+ }
+
+ IndexedDB::ObjectStoreOverwriteMode mode = static_cast<IndexedDB::ObjectStoreOverwriteMode>(overwriteMode);
+ auto buffer = ThreadSafeDataBuffer::copyVector(data.vector());
+
+ DatabaseProcess::singleton().idbServer().putOrAdd(request, key, buffer, mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::getRecord(const IDBRequestData&, const IDBKeyRangeData&)
</del><ins>+void WebIDBConnectionToClient::getRecord(const IDBRequestData& request, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().getRecord(request, range);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::getCount(const IDBRequestData&, const IDBKeyRangeData&)
</del><ins>+void WebIDBConnectionToClient::getCount(const IDBRequestData& request, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().getCount(request, range);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::deleteRecord(const IDBRequestData&, const IDBKeyRangeData&)
</del><ins>+void WebIDBConnectionToClient::deleteRecord(const IDBRequestData& request, const IDBKeyRangeData& range)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().deleteRecord(request, range);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::openCursor(const IDBRequestData&, const IDBCursorInfo&)
</del><ins>+void WebIDBConnectionToClient::openCursor(const IDBRequestData& request, const IDBCursorInfo& info)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().openCursor(request, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long)
</del><ins>+void WebIDBConnectionToClient::iterateCursor(const IDBRequestData& request, const IDBKeyData& key, unsigned long count)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().iterateCursor(request, key, count);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::establishTransaction(uint64_t, const IDBTransactionInfo&)
</del><ins>+void WebIDBConnectionToClient::establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo& info)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().establishTransaction(databaseConnectionIdentifier, info);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t)
</del><ins>+void WebIDBConnectionToClient::databaseConnectionClosed(uint64_t databaseConnectionIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().databaseConnectionClosed(databaseConnectionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::abortOpenAndUpgradeNeeded(uint64_t, const IDBResourceIdentifier&)
</del><ins>+void WebIDBConnectionToClient::abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().abortOpenAndUpgradeNeeded(databaseConnectionIdentifier, transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didFireVersionChangeEvent(uint64_t, const IDBResourceIdentifier&)
</del><ins>+void WebIDBConnectionToClient::didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier)
</ins><span class="cx"> {
</span><ins>+ DatabaseProcess::singleton().idbServer().didFireVersionChangeEvent(databaseConnectionIdentifier, transactionIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier);
</span><span class="cx"> void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&);
</span><span class="cx"> void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName);
</span><del>- void putOrAdd(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, const IPC::DataReference& value, bool overwriteEnabled);
</del><ins>+ void putOrAdd(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, const IPC::DataReference& value, unsigned overwriteMode);
</ins><span class="cx"> void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
</span><span class="cx"> void getCount(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
</span><span class="cx"> void deleteRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&);
</span><span class="lines">@@ -102,11 +102,12 @@
</span><span class="cx">
</span><span class="cx"> void disconnectedFromWebProcess();
</span><span class="cx">
</span><ins>+ void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebIDBConnectionToClient(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier);
</span><span class="cx">
</span><span class="cx"> virtual IPC::Connection* messageSenderConnection() override final;
</span><del>- void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&);
</del><span class="cx">
</span><span class="cx"> Ref<DatabaseToWebProcessConnection> m_connection;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in (196770 => 196771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-02-18 20:18:39 UTC (rev 196770)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.messages.in 2016-02-18 20:23:51 UTC (rev 196771)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> ClearObjectStore(WebCore::IDBRequestData requestData, uint64_t objectStoreIdentifier);
</span><span class="cx"> CreateIndex(WebCore::IDBRequestData requestData, WebCore::IDBIndexInfo info);
</span><span class="cx"> DeleteIndex(WebCore::IDBRequestData requestData, uint64_t objectStoreIdentifier, String indexName);
</span><del>- PutOrAdd(WebCore::IDBRequestData requestData, WebCore::IDBKeyData key, IPC::DataReference value, bool overwriteEnabled);
</del><ins>+ PutOrAdd(WebCore::IDBRequestData requestData, WebCore::IDBKeyData key, IPC::DataReference value, unsigned overwriteMode);
</ins><span class="cx"> GetRecord(WebCore::IDBRequestData requestData, struct WebCore::IDBKeyRangeData range);
</span><span class="cx"> GetCount(WebCore::IDBRequestData requestData, struct WebCore::IDBKeyRangeData range);
</span><span class="cx"> DeleteRecord(WebCore::IDBRequestData requestData, struct WebCore::IDBKeyRangeData range);
</span></span></pre>
</div>
</div>
</body>
</html>