<!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>[196725] 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/196725">196725</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-02-17 15:25:20 -0800 (Wed, 17 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: More Encoder/Decoder/Messaging scaffolding for WK2 IPC.
https://bugs.webkit.org/show_bug.cgi?id=154356
Reviewed by Alex Christensen.
No change in behavior yet; Just laying the groundwork.
Source/WebCore:
* Modules/indexeddb/shared/IDBDatabaseInfo.h:
(WebCore::IDBDatabaseInfo::encode):
(WebCore::IDBDatabaseInfo::decode):
* Modules/indexeddb/shared/IDBError.h:
(WebCore::IDBError::encode):
(WebCore::IDBError::decode):
* Modules/indexeddb/shared/IDBRequestData.h:
(WebCore::IDBRequestData::decode):
* Modules/indexeddb/shared/IDBResultData.h:
(WebCore::IDBResultData::encode):
(WebCore::IDBResultData::decode):
Source/WebKit2:
* DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
(WebKit::WebIDBConnectionToClient::didDeleteDatabase):
(WebKit::WebIDBConnectionToClient::didOpenDatabase):
(WebKit::WebIDBConnectionToClient::didAbortTransaction):
(WebKit::WebIDBConnectionToClient::didCommitTransaction):
(WebKit::WebIDBConnectionToClient::didCreateObjectStore):
(WebKit::WebIDBConnectionToClient::didDeleteObjectStore):
(WebKit::WebIDBConnectionToClient::didClearObjectStore):
(WebKit::WebIDBConnectionToClient::didCreateIndex):
(WebKit::WebIDBConnectionToClient::didDeleteIndex):
(WebKit::WebIDBConnectionToClient::didPutOrAdd):
(WebKit::WebIDBConnectionToClient::didGetRecord):
(WebKit::WebIDBConnectionToClient::didGetCount):
(WebKit::WebIDBConnectionToClient::didDeleteRecord):
(WebKit::WebIDBConnectionToClient::didOpenCursor):
(WebKit::WebIDBConnectionToClient::didIterateCursor):
(WebKit::WebIDBConnectionToClient::fireVersionChangeEvent):
(WebKit::WebIDBConnectionToClient::didStartTransaction):
(WebKit::WebIDBConnectionToClient::notifyOpenDBRequestBlocked):
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfoh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBErrorh">trunk/Source/WebCore/Modules/indexeddb/shared/IDBError.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBResultDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServercpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServerh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServermessagesin">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.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 (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebCore/ChangeLog 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-02-17 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: More Encoder/Decoder/Messaging scaffolding for WK2 IPC.
+ https://bugs.webkit.org/show_bug.cgi?id=154356
+
+ Reviewed by Alex Christensen.
+
+ No change in behavior yet; Just laying the groundwork.
+
+ * Modules/indexeddb/shared/IDBDatabaseInfo.h:
+ (WebCore::IDBDatabaseInfo::encode):
+ (WebCore::IDBDatabaseInfo::decode):
+
+ * Modules/indexeddb/shared/IDBError.h:
+ (WebCore::IDBError::encode):
+ (WebCore::IDBError::decode):
+
+ * Modules/indexeddb/shared/IDBRequestData.h:
+ (WebCore::IDBRequestData::decode):
+
+ * Modules/indexeddb/shared/IDBResultData.h:
+ (WebCore::IDBResultData::encode):
+ (WebCore::IDBResultData::decode):
+
</ins><span class="cx"> 2016-02-17 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement Proxy [[Get]]
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBDatabaseInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBDatabaseInfo.h 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -59,13 +59,16 @@
</span><span class="cx"> void deleteObjectStore(const String& objectStoreName);
</span><span class="cx"> void deleteObjectStore(uint64_t objectStoreIdentifier);
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT IDBDatabaseInfo();
+
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, IDBDatabaseInfo&);
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> String loggingString() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- IDBDatabaseInfo();
-
</del><span class="cx"> IDBObjectStoreInfo* getInfoForExistingObjectStore(const String& objectStoreName);
</span><span class="cx"> IDBObjectStoreInfo* getInfoForExistingObjectStore(uint64_t objectStoreIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -77,6 +80,30 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void IDBDatabaseInfo::encode(Encoder& encoder) const
+{
+ encoder << m_name << m_version << m_maxObjectStoreID << m_objectStoreMap;
+}
+
+template<class Decoder>
+bool IDBDatabaseInfo::decode(Decoder& decoder, IDBDatabaseInfo& info)
+{
+ if (!decoder.decode(info.m_name))
+ return false;
+
+ if (!decoder.decode(info.m_version))
+ return false;
+
+ if (!decoder.decode(info.m_maxObjectStoreID))
+ return false;
+
+ if (!decoder.decode(info.m_objectStoreMap))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBError.h (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBError.h 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBError.h 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -57,11 +57,24 @@
</span><span class="cx"> String m_message;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<class Decoder> bool IDBError::decode(Decoder&, IDBError&)
</del><ins>+template<class Encoder>
+void IDBError::encode(Encoder& encoder) const
</ins><span class="cx"> {
</span><del>- return false;
</del><ins>+ encoder << m_code << m_message;
</ins><span class="cx"> }
</span><ins>+
+template<class Decoder>
+bool IDBError::decode(Decoder& decoder, IDBError& error)
+{
+ if (!decoder.decode(error.m_code))
+ return false;
</ins><span class="cx">
</span><ins>+ if (!decoder.decode(error.m_message))
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -137,28 +137,28 @@
</span><span class="cx"> if (!decoder.decode(hasObject))
</span><span class="cx"> return false;
</span><span class="cx"> if (hasObject) {
</span><del>- IDBResourceIdentifier identifier;
- if (!decoder.decode(identifier))
</del><ins>+ std::unique_ptr<IDBResourceIdentifier> object = std::make_unique<IDBResourceIdentifier>();
+ if (!decoder.decode(*object))
</ins><span class="cx"> return false;
</span><del>- request.m_requestIdentifier = std::make_unique<IDBResourceIdentifier>(identifier);
</del><ins>+ request.m_requestIdentifier = WTFMove(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!decoder.decode(hasObject))
</span><span class="cx"> return false;
</span><span class="cx"> if (hasObject) {
</span><del>- IDBResourceIdentifier identifier;
- if (!decoder.decode(identifier))
</del><ins>+ std::unique_ptr<IDBResourceIdentifier> object = std::make_unique<IDBResourceIdentifier>();
+ if (!decoder.decode(*object))
</ins><span class="cx"> return false;
</span><del>- request.m_transactionIdentifier = std::make_unique<IDBResourceIdentifier>(identifier);
</del><ins>+ request.m_transactionIdentifier = WTFMove(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!decoder.decode(hasObject))
</span><span class="cx"> return false;
</span><span class="cx"> if (hasObject) {
</span><del>- IDBResourceIdentifier identifier;
- if (!decoder.decode(identifier))
</del><ins>+ std::unique_ptr<IDBResourceIdentifier> object = std::make_unique<IDBResourceIdentifier>();
+ if (!decoder.decode(*object))
</ins><span class="cx"> return false;
</span><del>- request.m_cursorIdentifier = std::make_unique<IDBResourceIdentifier>(identifier);
</del><ins>+ request.m_cursorIdentifier = WTFMove(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBResultDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBResultData.h 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -118,11 +118,88 @@
</span><span class="cx"> uint64_t m_resultInteger { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<class Decoder> bool IDBResultData::decode(Decoder&, IDBResultData&)
</del><ins>+template<class Encoder>
+void IDBResultData::encode(Encoder& encoder) const
</ins><span class="cx"> {
</span><del>- return false;
</del><ins>+ encoder << m_requestIdentifier << m_error << m_databaseConnectionIdentifier << m_resultInteger;
+
+ encoder.encodeEnum(m_type);
+
+ encoder << !!m_databaseInfo;
+ if (m_databaseInfo)
+ encoder << *m_databaseInfo;
+
+ encoder << !!m_transactionInfo;
+ if (m_transactionInfo)
+ encoder << *m_transactionInfo;
+
+ encoder << !!m_resultKey;
+ if (m_resultKey)
+ encoder << *m_resultKey;
+
+ encoder << !!m_getResult;
+ if (m_getResult)
+ encoder << *m_getResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<class Decoder> bool IDBResultData::decode(Decoder& decoder, IDBResultData& result)
+{
+ if (!decoder.decode(result.m_requestIdentifier))
+ return false;
+
+ if (!decoder.decode(result.m_error))
+ return false;
+
+ if (!decoder.decode(result.m_databaseConnectionIdentifier))
+ return false;
+
+ if (!decoder.decode(result.m_resultInteger))
+ return false;
+
+ if (!decoder.decodeEnum(result.m_type))
+ return false;
+
+ bool hasObject;
+
+ if (!decoder.decode(hasObject))
+ return false;
+ if (hasObject) {
+ std::unique_ptr<IDBDatabaseInfo> object = std::make_unique<IDBDatabaseInfo>();
+ if (!decoder.decode(*object))
+ return false;
+ result.m_databaseInfo = WTFMove(object);
+ }
+
+ if (!decoder.decode(hasObject))
+ return false;
+ if (hasObject) {
+ std::unique_ptr<IDBTransactionInfo> object = std::make_unique<IDBTransactionInfo>();
+ if (!decoder.decode(*object))
+ return false;
+ result.m_transactionInfo = WTFMove(object);
+ }
+
+ if (!decoder.decode(hasObject))
+ return false;
+ if (hasObject) {
+ std::unique_ptr<IDBKeyData> object = std::make_unique<IDBKeyData>();
+ if (!decoder.decode(*object))
+ return false;
+ result.m_resultKey = WTFMove(object);
+ }
+
+ if (!decoder.decode(hasObject))
+ return false;
+ if (hasObject) {
+ std::unique_ptr<IDBGetResult> object = std::make_unique<IDBGetResult>();
+ if (!decoder.decode(*object))
+ return false;
+ result.m_getResult = WTFMove(object);
+ }
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-02-17 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: More Encoder/Decoder/Messaging scaffolding for WK2 IPC.
+ https://bugs.webkit.org/show_bug.cgi?id=154356
+
+ Reviewed by Alex Christensen.
+
+ No change in behavior yet; Just laying the groundwork.
+
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ (WebKit::WebIDBConnectionToClient::didDeleteDatabase):
+ (WebKit::WebIDBConnectionToClient::didOpenDatabase):
+ (WebKit::WebIDBConnectionToClient::didAbortTransaction):
+ (WebKit::WebIDBConnectionToClient::didCommitTransaction):
+ (WebKit::WebIDBConnectionToClient::didCreateObjectStore):
+ (WebKit::WebIDBConnectionToClient::didDeleteObjectStore):
+ (WebKit::WebIDBConnectionToClient::didClearObjectStore):
+ (WebKit::WebIDBConnectionToClient::didCreateIndex):
+ (WebKit::WebIDBConnectionToClient::didDeleteIndex):
+ (WebKit::WebIDBConnectionToClient::didPutOrAdd):
+ (WebKit::WebIDBConnectionToClient::didGetRecord):
+ (WebKit::WebIDBConnectionToClient::didGetCount):
+ (WebKit::WebIDBConnectionToClient::didDeleteRecord):
+ (WebKit::WebIDBConnectionToClient::didOpenCursor):
+ (WebKit::WebIDBConnectionToClient::didIterateCursor):
+ (WebKit::WebIDBConnectionToClient::fireVersionChangeEvent):
+ (WebKit::WebIDBConnectionToClient::didStartTransaction):
+ (WebKit::WebIDBConnectionToClient::notifyOpenDBRequestBlocked):
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in:
+
</ins><span class="cx"> 2016-02-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix GTK build after r196720.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBWebIDBConnectionToClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -28,6 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+#include "WebCoreArgumentCoders.h"
+#include "WebIDBConnectionToServerMessages.h"
+#include <WebCore/IDBError.h>
+#include <WebCore/IDBResultData.h>
+#include <WebCore/UniqueIDBDatabaseConnection.h>
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -62,76 +68,94 @@
</span><span class="cx"> return *m_connectionToClient;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didDeleteDatabase(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didDeleteDatabase(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidDeleteDatabase(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didOpenDatabase(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didOpenDatabase(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidOpenDatabase(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&)
</del><ins>+void WebIDBConnectionToClient::didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError& error)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidAbortTransaction(transactionIdentifier, error));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didCommitTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&)
</del><ins>+void WebIDBConnectionToClient::didCommitTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError& error)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidCommitTransaction(transactionIdentifier, error));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didCreateObjectStore(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didCreateObjectStore(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidCreateObjectStore(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didDeleteObjectStore(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didDeleteObjectStore(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidDeleteObjectStore(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didClearObjectStore(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didClearObjectStore(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidClearObjectStore(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didCreateIndex(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didCreateIndex(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidCreateIndex(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didDeleteIndex(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didDeleteIndex(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidDeleteIndex(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didPutOrAdd(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didPutOrAdd(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidPutOrAdd(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didGetRecord(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didGetRecord(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidGetRecord(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didGetCount(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didGetCount(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidGetCount(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didDeleteRecord(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didDeleteRecord(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidDeleteRecord(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didOpenCursor(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didOpenCursor(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidOpenCursor(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didIterateCursor(const WebCore::IDBResultData&)
</del><ins>+void WebIDBConnectionToClient::didIterateCursor(const WebCore::IDBResultData& resultData)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidIterateCursor(resultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::fireVersionChangeEvent(WebCore::IDBServer::UniqueIDBDatabaseConnection&, const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
</del><ins>+void WebIDBConnectionToClient::fireVersionChangeEvent(WebCore::IDBServer::UniqueIDBDatabaseConnection& connection, const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::FireVersionChangeEvent(connection.identifier(), requestIdentifier, requestedVersion));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBConnectionToClient::didStartTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&)
</del><ins>+void WebIDBConnectionToClient::didStartTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError& error)
</ins><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::DidStartTransaction(transactionIdentifier, error));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIDBConnectionToClient::notifyOpenDBRequestBlocked(const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion)
</span><span class="cx"> {
</span><ins>+ send(Messages::WebIDBConnectionToServer::NotifyOpenDBRequestBlocked(requestIdentifier, oldVersion, newVersion));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIDBConnectionToClient::deleteDatabase(const IDBRequestData&)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -249,7 +249,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBConnectionToServer::fireVersionChangeEvent(uint64_t, const WebCore::IDBResourceIdentifier&, uint64_t)
+{
+}
</ins><span class="cx">
</span><ins>+void WebIDBConnectionToServer::didStartTransaction(const WebCore::IDBResourceIdentifier&, const WebCore::IDBError&)
+{
+}
+
+void WebIDBConnectionToServer::notifyOpenDBRequestBlocked(const WebCore::IDBResourceIdentifier&, uint64_t, uint64_t)
+{
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -84,6 +84,9 @@
</span><span class="cx"> void didDeleteRecord(const WebCore::IDBResultData&);
</span><span class="cx"> void didOpenCursor(const WebCore::IDBResultData&);
</span><span class="cx"> void didIterateCursor(const WebCore::IDBResultData&);
</span><ins>+ void fireVersionChangeEvent(uint64_t uniqueDatabaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion);
+ void didStartTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&);
+ void notifyOpenDBRequestBlocked(const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebIDBConnectionToServer();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBConnectionToServermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in (196724 => 196725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in 2016-02-17 23:11:59 UTC (rev 196724)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in 2016-02-17 23:25:20 UTC (rev 196725)
</span><span class="lines">@@ -38,6 +38,11 @@
</span><span class="cx"> DidDeleteRecord(WebCore::IDBResultData result)
</span><span class="cx"> DidOpenCursor(WebCore::IDBResultData result)
</span><span class="cx"> DidIterateCursor(WebCore::IDBResultData result)
</span><ins>+
+ FireVersionChangeEvent(uint64_t databaseConnectionIdentifier, WebCore::IDBResourceIdentifier requestIdentifier, uint64_t requestedVersion)
+ DidStartTransaction(WebCore::IDBResourceIdentifier transactionIdentifier, WebCore::IDBError error)
+ NotifyOpenDBRequestBlocked(WebCore::IDBResourceIdentifier requestIdentifier, uint64_t oldVersion, uint64_t newVersion)
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span></span></pre>
</div>
</div>
</body>
</html>