<!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>[162566] 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/162566">162566</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 15:48:27 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDB: "Put" support
<rdar://problem/15779643> and https://bugs.webkit.org/show_bug.cgi?id=127401
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Add persistent encode/decode for storage to the database:
* Modules/indexeddb/IDBKey.cpp:
(WebCore::IDBKey::encode):
(WebCore::IDBKey::decode):
* Modules/indexeddb/IDBKey.h:
Add a data class to represent IDBKey suitable for crossing IPC:
* Modules/indexeddb/IDBKeyData.cpp: Added.
(WebCore::IDBKeyData::IDBKeyData):
(WebCore::IDBKeyData::maybeCreateIDBKey):
(WebCore::IDBKeyData::isolatedCopy):
* Modules/indexeddb/IDBKeyData.h: Added.
(WebCore::IDBKeyData::IDBKeyData):
* platform/CrossThreadCopier.cpp:
(WebCore::IDBKeyData>::copy):
* platform/CrossThreadCopier.h:
* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
Source/WebKit2:
Ship putRecord requests over to the DatabaseProcess, and listen for completion from the DatabaseProcess:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::put):
(WebKit::WebIDBServerConnection::didPutRecord):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:
Pass off the putRecord request to the Unique IDBDatabase:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::putRecord):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
Pass off the putRecord request to the backing store:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::putRecord):
(WebKit::UniqueIDBDatabase::putRecordInBackingStore):
(WebKit::UniqueIDBDatabase::didPutRecordInBackingStore):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
Add backing store methods related to putRecord, though only one is critical right now:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h:
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::generateKey):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::keyExistsInObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::putRecord):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::updateKeyGenerator):
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
Add the IDBKeyData type to IPC:
* Scripts/webkit2/messages.py:
(struct_or_class):
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<IDBKeyData>::encode):
(IPC::ArgumentCoder<IDBKeyData>::decode):
* Shared/WebCoreArgumentCoders.h:
* DatabaseProcess/IndexedDB/IDBSerialization.cpp:
(WebKit::serializeIDBKey):
* DatabaseProcess/IndexedDB/IDBSerialization.h:
Implement more cross-thread copying:
* Shared/WebCrossThreadCopier.cpp:
(WebCore::Vector<uint8_t>>::copy):
(WebCore::Vector<Vector<IDBKeyData>>>::copy):
(WebCore::ASCIILiteral>::copy):
* Shared/WebCrossThreadCopier.h:
Implement more numbers of generic AsyncTask templates:
* Shared/AsyncTask.h:
(WebKit::createAsyncTask):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeycpp">trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyh">trunk/Source/WebCore/Modules/indexeddb/IDBKey.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopiercpp">trunk/Source/WebCore/platform/CrossThreadCopier.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadCopierh">trunk/Source/WebCore/platform/CrossThreadCopier.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBIDBSerializationcpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBIDBSerializationh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.h</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="#trunkSourceWebKit2Scriptswebkit2messagespy">trunk/Source/WebKit2/Scripts/webkit2/messages.py</a></li>
<li><a href="#trunkSourceWebKit2SharedAsyncTaskh">trunk/Source/WebKit2/Shared/AsyncTask.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.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="#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="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatah">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -811,6 +811,7 @@
</span><span class="cx"> Modules/indexeddb/IDBFactoryBackendInterface.cpp
</span><span class="cx"> Modules/indexeddb/IDBIndex.cpp
</span><span class="cx"> Modules/indexeddb/IDBKey.cpp
</span><ins>+ Modules/indexeddb/IDBKeyData.cpp
</ins><span class="cx"> Modules/indexeddb/IDBKeyPath.cpp
</span><span class="cx"> Modules/indexeddb/IDBKeyRange.cpp
</span><span class="cx"> Modules/indexeddb/IDBObjectStore.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-01-21 Brady Eidson <beidson@apple.com>
+
+ IDB: "Put" support
+ <rdar://problem/15779643> and https://bugs.webkit.org/show_bug.cgi?id=127401
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add persistent encode/decode for storage to the database:
+ * Modules/indexeddb/IDBKey.cpp:
+ (WebCore::IDBKey::encode):
+ (WebCore::IDBKey::decode):
+ * Modules/indexeddb/IDBKey.h:
+
+ Add a data class to represent IDBKey suitable for crossing IPC:
+ * Modules/indexeddb/IDBKeyData.cpp: Added.
+ (WebCore::IDBKeyData::IDBKeyData):
+ (WebCore::IDBKeyData::maybeCreateIDBKey):
+ (WebCore::IDBKeyData::isolatedCopy):
+ * Modules/indexeddb/IDBKeyData.h: Added.
+ (WebCore::IDBKeyData::IDBKeyData):
+
+ * platform/CrossThreadCopier.cpp:
+ (WebCore::IDBKeyData>::copy):
+ * platform/CrossThreadCopier.h:
+
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-01-22 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Implement ANGLE_instanced_arrays
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> DerivedSources/WebCore/InspectorWebBackendDispatchers.cpp \
</span><span class="cx"> DerivedSources/WebCore/InspectorWebBackendDispatchers.h \
</span><span class="cx"> DerivedSources/WebCore/InspectorWebFrontendDispatchers.cpp \
</span><del>- DerivedSources/WebCore/InspectorWebFrontendDispatchers.h \
</del><ins>+ DerivedSources/WebCore/InspectorWebFrontendDispatchers.h \
</ins><span class="cx"> DerivedSources/WebCore/InspectorWebTypeBuilders.cpp \
</span><span class="cx"> DerivedSources/WebCore/InspectorWebTypeBuilders.h \
</span><span class="cx"> DerivedSources/WebCore/JSANGLEInstancedArrays.cpp \
</span><span class="lines">@@ -1845,6 +1845,8 @@
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBIndex.h \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBKey.cpp \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBKey.h \
</span><ins>+ Source/WebCore/Modules/indexeddb/IDBKeyData.cpp \
+ Source/WebCore/Modules/indexeddb/IDBKeyData.h \
</ins><span class="cx"> Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBKeyPath.h \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><ins>+#include "KeyedCoding.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> IDBKey::~IDBKey()
</span><span class="lines">@@ -96,6 +98,41 @@
</span><span class="cx"> return !compare(other);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBKey::encode(KeyedEncoder& encoder) const
+{
+ encoder.encodeEnum("type", m_type);
+
+ switch (m_type) {
+ case InvalidType:
+ return;
+ case ArrayType:
+ encoder.encodeObjects("array", m_array.begin(), m_array.end(), [](WebCore::KeyedEncoder& encoder, const RefPtr<IDBKey>& key) {
+ encoder.encodeObject("idbKey", *key, [](KeyedEncoder& encoder, const IDBKey& key) {
+ key.encode(encoder);
+ });
+ });
+ return;
+ case StringType:
+ encoder.encodeString("string", m_string);
+ return;
+ case DateType:
+ case NumberType:
+ encoder.encodeDouble("number", m_number);
+ return;
+ case MinType:
+ ASSERT_NOT_REACHED();
+ return;
+ }
+
+ ASSERT_NOT_REACHED();
+}
+
+bool IDBKey::decode(KeyedDecoder&, IDBKey&)
+{
+ // FIXME: Implement when IDB Get support is implemented (<rdar://problem/15779644>)
+ return false;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKey.h (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKey.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKey.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -35,6 +35,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class KeyedDecoder;
+class KeyedEncoder;
+
</ins><span class="cx"> class IDBKey : public RefCounted<IDBKey> {
</span><span class="cx"> public:
</span><span class="cx"> typedef Vector<RefPtr<IDBKey>> KeyArray;
</span><span class="lines">@@ -147,6 +150,9 @@
</span><span class="cx"> using RefCounted<IDBKey>::ref;
</span><span class="cx"> using RefCounted<IDBKey>::deref;
</span><span class="cx">
</span><ins>+ void encode(KeyedEncoder&) const;
+ static bool decode(KeyedDecoder&, IDBKey&);
+
</ins><span class="cx"> private:
</span><span class="cx"> IDBKey() : m_type(InvalidType), m_number(0), m_sizeEstimate(OverheadSize) { }
</span><span class="cx"> IDBKey(Type type, double number) : m_type(type), m_number(number), m_sizeEstimate(OverheadSize + sizeof(double)) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (0 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -0,0 +1,131 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "IDBKeyData.h"
+
+#if ENABLE(INDEXED_DATABASE)
+
+namespace WebCore {
+
+IDBKeyData::IDBKeyData(IDBKey* key)
+ : type(IDBKey::InvalidType)
+ , numberValue(0)
+ , isNull(false)
+{
+ if (!key) {
+ isNull = true;
+ return;
+ }
+
+ type = key->type();
+ numberValue = 0;
+
+ switch (type) {
+ case IDBKey::InvalidType:
+ break;
+ case IDBKey::ArrayType:
+ for (auto key2 : key->array())
+ arrayValue.append(IDBKeyData(key2.get()));
+ break;
+ case IDBKey::StringType:
+ stringValue = key->string();
+ break;
+ case IDBKey::DateType:
+ numberValue = key->date();
+ break;
+ case IDBKey::NumberType:
+ numberValue = key->number();
+ break;
+ case IDBKey::MinType:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
+PassRefPtr<IDBKey> IDBKeyData::maybeCreateIDBKey() const
+{
+ if (isNull)
+ return nullptr;
+
+ switch (type) {
+ case IDBKey::InvalidType:
+ return IDBKey::createInvalid();
+ case IDBKey::ArrayType:
+ {
+ IDBKey::KeyArray array;
+ for (auto keyData : arrayValue) {
+ array.append(keyData.maybeCreateIDBKey());
+ ASSERT(array.last());
+ }
+ return IDBKey::createArray(array);
+ }
+ case IDBKey::StringType:
+ return IDBKey::createString(stringValue);
+ case IDBKey::DateType:
+ return IDBKey::createDate(numberValue);
+ case IDBKey::NumberType:
+ return IDBKey::createNumber(numberValue);
+ case IDBKey::MinType:
+ ASSERT_NOT_REACHED();
+ return nullptr;
+ }
+
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+
+IDBKeyData IDBKeyData::isolatedCopy() const
+{
+ IDBKeyData result;
+ result.type = type;
+ result.isNull = isNull;
+
+ switch (type) {
+ case IDBKey::InvalidType:
+ return result;
+ case IDBKey::ArrayType:
+ for (auto key : arrayValue)
+ result.arrayValue.append(key.isolatedCopy());
+ return result;
+ case IDBKey::StringType:
+ result.stringValue = stringValue.isolatedCopy();
+ return result;
+ case IDBKey::DateType:
+ case IDBKey::NumberType:
+ result.numberValue = numberValue;
+ return result;
+ case IDBKey::MinType:
+ ASSERT_NOT_REACHED();
+ return result;
+ }
+
+ ASSERT_NOT_REACHED();
+ return result;
+}
+
+}
+
+#endif // ENABLE(INDEXED_DATABASE)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatahfromrev162565trunkSourceWebKit2DatabaseProcessIndexedDBIDBSerializationh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h (from rev 162565, trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.h) (0 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 IDBKeyData_h
+#define IDBKeyData_h
+
+#if ENABLE(INDEXED_DATABASE)
+
+#include "IDBKey.h"
+
+namespace WebCore {
+
+struct IDBKeyData {
+ IDBKeyData()
+ : type(IDBKey::InvalidType)
+ , numberValue(0)
+ , isNull(true)
+ {
+ }
+
+ IDBKeyData(IDBKey*);
+
+ PassRefPtr<IDBKey> maybeCreateIDBKey() const;
+
+ IDBKeyData isolatedCopy() const;
+
+ IDBKey::Type type;
+ Vector<IDBKeyData> arrayValue;
+ String stringValue;
+ double numberValue;
+ bool isNull;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
+#endif // IDBKeyData_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendOperations.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -106,7 +106,8 @@
</span><span class="cx"> RefPtr<PutOperation> operation(this);
</span><span class="cx"> STANDARD_DATABASE_ERROR_CALLBACK;
</span><span class="cx">
</span><del>- m_transaction->database().serverConnection().put(*m_transaction, *this, [this, operation, operationCallback](PassRefPtr<IDBKey> key, PassRefPtr<IDBDatabaseError> error) {
</del><ins>+ m_transaction->database().serverConnection().put(*m_transaction, *this, [this, operation, operationCallback](PassRefPtr<IDBKey> key, PassRefPtr<IDBDatabaseError> prpError) {
+ RefPtr<IDBDatabaseError> error = prpError;
</ins><span class="cx"> if (key) {
</span><span class="cx"> ASSERT(!error);
</span><span class="cx"> m_callbacks->onSuccess(key);
</span><span class="lines">@@ -114,6 +115,7 @@
</span><span class="cx"> ASSERT(error);
</span><span class="cx"> m_callbacks->onError(error);
</span><span class="cx"> }
</span><ins>+ operationCallback(error.release());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -3077,13 +3077,19 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><ins>+__ZNK7WebCore10IDBKeyData17maybeCreateIDBKeyEv
</ins><span class="cx"> __ZNK7WebCore10IDBKeyPath6encodeERNS_12KeyedEncoderE
</span><ins>+__ZNK7WebCore6IDBKey6encodeERNS_12KeyedEncoderE
+__ZNK7WebCore6IDBKey7isValidEv
+__ZN7WebCore10IDBKeyDataC1EPNS_6IDBKeyE
</ins><span class="cx"> __ZN7WebCore10IDBKeyPathC1ERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore10IDBKeyPathC1ERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore10IDBKeyPath6decodeERNS_12KeyedDecoderERS0_
</span><span class="cx"> __ZN7WebCore18IDBDatabaseBackend14openConnectionEN3WTF10PassRefPtrINS_12IDBCallbacksEEENS2_INS_20IDBDatabaseCallbacksEEExy
</span><span class="cx"> __ZN7WebCore18IDBDatabaseBackend6createERKN3WTF6StringES4_PNS_26IDBFactoryBackendInterfaceERNS_19IDBServerConnectionE
</span><span class="cx"> __ZN7WebCore18IDBDatabaseBackendD1Ev
</span><ins>+__ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_10IDBKeyDataEE4copyERKS1_
</ins><span class="cx"> __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_22IDBObjectStoreMetadataEE4copyERKS1_
</span><span class="cx"> __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_9IndexedDB15TransactionModeEE4copyERKS2_
</span><ins>+__ZN7WebCore6IDBKeyD1Ev
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -6614,6 +6614,7 @@
</span><span class="cx"> <ClCompile Include="..\Modules\indexeddb\IDBFactoryBackendInterface.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\indexeddb\IDBIndex.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\indexeddb\IDBKey.cpp" />
</span><ins>+ <ClCompile Include="..\Modules\indexeddb\IDBKeyData.cpp" />
</ins><span class="cx"> <ClCompile Include="..\Modules\indexeddb\IDBKeyRange.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\indexeddb\IDBObjectStore.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\indexeddb\IDBRequest.cpp" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -1779,6 +1779,8 @@
</span><span class="cx"> 510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */; };
</span><span class="cx"> 5112935F3D54B4B52FAF973F /* InspectorHeapProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511293613D6DB4B52FAF973F /* InspectorHeapProfilerAgent.cpp */; };
</span><span class="cx"> 511293603D60B4B52FAF973F /* InspectorHeapProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 511293623D85B4B52FAF973F /* InspectorHeapProfilerAgent.h */; };
</span><ins>+ 511EC1A6188DACA400BA3EB6 /* IDBKeyData.h in Headers */ = {isa = PBXBuildFile; fileRef = 511EC1A5188DACA400BA3EB6 /* IDBKeyData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 511EC1A8188DAE7B00BA3EB6 /* IDBKeyData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EC1A7188DAE7B00BA3EB6 /* IDBKeyData.cpp */; };
</ins><span class="cx"> 511EF2C017F0FD3500E4FA16 /* JSIDBAny.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2A817F0FC4800E4FA16 /* JSIDBAny.cpp */; };
</span><span class="cx"> 511EF2C117F0FD3500E4FA16 /* JSIDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2A917F0FC4800E4FA16 /* JSIDBCursor.cpp */; };
</span><span class="cx"> 511EF2C217F0FD3500E4FA16 /* JSIDBCursorWithValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EF2AA17F0FC4800E4FA16 /* JSIDBCursorWithValue.cpp */; };
</span><span class="lines">@@ -8730,6 +8732,8 @@
</span><span class="cx"> 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 511293613D6DB4B52FAF973F /* InspectorHeapProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorHeapProfilerAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 511293623D85B4B52FAF973F /* InspectorHeapProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorHeapProfilerAgent.h; sourceTree = "<group>"; };
</span><ins>+ 511EC1A5188DACA400BA3EB6 /* IDBKeyData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKeyData.h; sourceTree = "<group>"; };
+ 511EC1A7188DAE7B00BA3EB6 /* IDBKeyData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKeyData.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 511EF2A817F0FC4800E4FA16 /* JSIDBAny.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBAny.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 511EF2A917F0FC4800E4FA16 /* JSIDBCursor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBCursor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 511EF2AA17F0FC4800E4FA16 /* JSIDBCursorWithValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBCursorWithValue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17704,6 +17708,8 @@
</span><span class="cx"> 51ABB5B6186D0ED1008391A1 /* IDBIndexMetadata.h */,
</span><span class="cx"> 51D71991181106E00016DC51 /* IDBKey.cpp */,
</span><span class="cx"> 51D71992181106E00016DC51 /* IDBKey.h */,
</span><ins>+ 511EC1A7188DAE7B00BA3EB6 /* IDBKeyData.cpp */,
+ 511EC1A5188DACA400BA3EB6 /* IDBKeyData.h */,
</ins><span class="cx"> 51D71993181106E00016DC51 /* IDBKeyPath.cpp */,
</span><span class="cx"> 51D71994181106E00016DC51 /* IDBKeyPath.h */,
</span><span class="cx"> 51D71995181106E00016DC51 /* IDBKeyRange.cpp */,
</span><span class="lines">@@ -24001,6 +24007,7 @@
</span><span class="cx"> CD8B5A49180E138B008B8E65 /* TextTrackMediaSource.h in Headers */,
</span><span class="cx"> A8EA7CAF0A192B9C00A8EF5F /* HTMLHRElement.h in Headers */,
</span><span class="cx"> A871DE270A152AC800B12A68 /* HTMLHtmlElement.h in Headers */,
</span><ins>+ 511EC1A6188DACA400BA3EB6 /* IDBKeyData.h in Headers */,
</ins><span class="cx"> 07969DB417D14151007FF842 /* JSRTCPeerConnectionErrorCallback.h in Headers */,
</span><span class="cx"> A871DE2A0A152AC800B12A68 /* HTMLIFrameElement.h in Headers */,
</span><span class="cx"> A8EA7D2D0A19385500A8EF5F /* HTMLImageElement.h in Headers */,
</span><span class="lines">@@ -28813,6 +28820,7 @@
</span><span class="cx"> 51771C8E182DB4B7008E781E /* IDBDatabaseBackend.cpp in Sources */,
</span><span class="cx"> 1A22464B0CC98DDB00C05240 /* SQLiteStatement.cpp in Sources */,
</span><span class="cx"> 1A22464D0CC98DDB00C05240 /* SQLiteTransaction.cpp in Sources */,
</span><ins>+ 511EC1A8188DAE7B00BA3EB6 /* IDBKeyData.cpp in Sources */,
</ins><span class="cx"> 97BC6A411505F081001B74AC /* SQLResultSet.cpp in Sources */,
</span><span class="cx"> 97BC6A441505F081001B74AC /* SQLResultSetRowList.cpp in Sources */,
</span><span class="cx"> 97BC6A471505F081001B74AC /* SQLStatement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> #include "IDBDatabaseMetadata.h"
</span><ins>+#include "IDBKeyData.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -98,6 +99,11 @@
</span><span class="cx"> return metadata.isolatedCopy();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CrossThreadCopierBase<false, false, IDBKeyData>::Type CrossThreadCopierBase<false, false, IDBKeyData>::copy(const IDBKeyData& keyData)
+{
+ return keyData.isolatedCopy();
+}
+
</ins><span class="cx"> CrossThreadCopierBase<false, false, IDBObjectStoreMetadata>::Type CrossThreadCopierBase<false, false, IDBObjectStoreMetadata>::copy(const IDBObjectStoreMetadata& metadata)
</span><span class="cx"> {
</span><span class="cx"> return metadata.isolatedCopy();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.h (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -173,6 +173,12 @@
</span><span class="cx"> static Type copy(const IDBIndexMetadata&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ struct IDBKeyData;
+ template<> struct CrossThreadCopierBase<false, false, IDBKeyData> {
+ typedef IDBKeyData Type;
+ static Type copy(const IDBKeyData&);
+ };
+
</ins><span class="cx"> struct IDBObjectStoreMetadata;
</span><span class="cx"> template<> struct CrossThreadCopierBase<false, false, IDBObjectStoreMetadata> {
</span><span class="cx"> typedef IDBObjectStoreMetadata Type;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -1,3 +1,64 @@
</span><ins>+2014-01-21 Brady Eidson <beidson@apple.com>
+
+ IDB: "Put" support
+ <rdar://problem/15779643> and https://bugs.webkit.org/show_bug.cgi?id=127401
+
+ Reviewed by Alexey Proskuryakov.
+
+ Ship putRecord requests over to the DatabaseProcess, and listen for completion from the DatabaseProcess:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::put):
+ (WebKit::WebIDBServerConnection::didPutRecord):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in:
+
+ Pass off the putRecord request to the Unique IDBDatabase:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::putRecord):
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+
+ Pass off the putRecord request to the backing store:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::putRecord):
+ (WebKit::UniqueIDBDatabase::putRecordInBackingStore):
+ (WebKit::UniqueIDBDatabase::didPutRecordInBackingStore):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ Add backing store methods related to putRecord, though only one is critical right now:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h:
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::generateKey):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::keyExistsInObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::putRecord):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::updateKeyGenerator):
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
+
+ Add the IDBKeyData type to IPC:
+ * Scripts/webkit2/messages.py:
+ (struct_or_class):
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<IDBKeyData>::encode):
+ (IPC::ArgumentCoder<IDBKeyData>::decode):
+ * Shared/WebCoreArgumentCoders.h:
+
+ * DatabaseProcess/IndexedDB/IDBSerialization.cpp:
+ (WebKit::serializeIDBKey):
+ * DatabaseProcess/IndexedDB/IDBSerialization.h:
+
+ Implement more cross-thread copying:
+ * Shared/WebCrossThreadCopier.cpp:
+ (WebCore::Vector<uint8_t>>::copy):
+ (WebCore::Vector<Vector<IDBKeyData>>>::copy):
+ (WebCore::ASCIILiteral>::copy):
+ * Shared/WebCrossThreadCopier.h:
+
+ Implement more numbers of generic AsyncTask templates:
+ * Shared/AsyncTask.h:
+ (WebKit::createAsyncTask):
+
</ins><span class="cx"> 2014-01-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WKProcessClass should create a WebContext
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -177,6 +177,18 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcessIDBConnection::putRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, const WebCore::IDBKeyData& key, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<WebCore::IDBKeyData>>& indexKeys)
+{
+ ASSERT(m_uniqueIDBDatabase);
+
+ LOG(IDB, "DatabaseProcess putRecord request ID %llu, object store id %lli", requestID, objectStoreID);
+ RefPtr<DatabaseProcessIDBConnection> connection(this);
+ m_uniqueIDBDatabase->putRecord(IDBTransactionIdentifier(*this, transactionID), objectStoreID, key, value, putMode, indexIDs, indexKeys, [connection, requestID](const IDBKeyData& keyData, uint32_t errorCode, const String& errorMessage) {
+ connection->send(Messages::WebIDBServerConnection::DidPutRecord(requestID, keyData, errorCode, errorMessage));
+ });
+}
+
+
</ins><span class="cx"> IPC::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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+struct IDBKeyData;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><span class="lines">@@ -71,6 +75,7 @@
</span><span class="cx"> void changeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion);
</span><span class="cx"> void createObjectStore(uint64_t requestID, int64_t transactionID, WebCore::IDBObjectStoreMetadata);
</span><span class="cx"> void deleteObjectStore(uint64_t requestID, int64_t transactionID, int64_t objectStoreID);
</span><ins>+ void putRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, const WebCore::IDBKeyData&, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<WebCore::IDBKeyData>>& indexKeys);
</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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> ChangeDatabaseVersion(uint64_t requestID, int64_t transactionID, uint64_t newVersion)
</span><span class="cx"> CreateObjectStore(uint64_t requestID, int64_t transactionID, WebCore::IDBObjectStoreMetadata objectStoreMetadata)
</span><span class="cx"> DeleteObjectStore(uint64_t requestID, int64_t transactionID, int64_t objectStoreID)
</span><ins>+ PutRecord(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, WebCore::IDBKeyData key, IPC::DataReference value, int64_t putMode, Vector<int64_t> indexIDs, Vector<Vector<WebCore::IDBKeyData>> indexKeys)
</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="trunkSourceWebKit2DatabaseProcessIndexedDBIDBSerializationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -30,13 +30,14 @@
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "KeyedDecoder.h"
</span><span class="cx"> #include "KeyedEncoder.h"
</span><ins>+#include <WebCore/IDBKey.h>
</ins><span class="cx"> #include <WebCore/IDBKeyPath.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-RefPtr<SharedBuffer> serializeIDBKeyPath(const WebCore::IDBKeyPath& keyPath)
</del><ins>+RefPtr<SharedBuffer> serializeIDBKeyPath(const IDBKeyPath& keyPath)
</ins><span class="cx"> {
</span><span class="cx"> KeyedEncoder encoder;
</span><span class="cx"> keyPath.encode(encoder);
</span><span class="lines">@@ -53,6 +54,13 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<WebCore::SharedBuffer> serializeIDBKey(const IDBKey& key)
+{
+ KeyedEncoder encoder;
+ key.encode(encoder);
+ return encoder.finishEncoding();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBIDBSerializationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.h (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/IDBSerialization.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class IDBKey;
</ins><span class="cx"> class IDBKeyPath;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -40,6 +41,9 @@
</span><span class="cx"> RefPtr<WebCore::SharedBuffer> serializeIDBKeyPath(const WebCore::IDBKeyPath&);
</span><span class="cx"> std::unique_ptr<WebCore::IDBKeyPath> deserializeIDBKeyPath(const uint8_t* buffer, size_t bufferSize);
</span><span class="cx">
</span><ins>+RefPtr<WebCore::SharedBuffer> serializeIDBKey(const WebCore::IDBKey&);
+PassRefPtr<WebCore::IDBKey> deserializeIDBKey(const uint8_t* buffer, size_t bufferSize);
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -30,13 +30,17 @@
</span><span class="cx">
</span><span class="cx"> #include "AsyncRequest.h"
</span><span class="cx"> #include "AsyncTask.h"
</span><ins>+#include "DataReference.h"
</ins><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx"> #include "DatabaseProcessIDBConnection.h"
</span><span class="cx"> #include "UniqueIDBDatabaseBackingStoreSQLite.h"
</span><span class="cx"> #include "WebCrossThreadCopier.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><ins>+#include <WebCore/IDBDatabaseBackend.h>
</ins><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><ins>+#include <WebCore/IDBKeyData.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -222,7 +226,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::openTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>& objectStoreIDs, WebCore::IndexedDB::TransactionMode mode, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::openTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>& objectStoreIDs, IndexedDB::TransactionMode mode, std::function<void(bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> postTransactionOperation(identifier, createAsyncTask(*this, &UniqueIDBDatabase::openBackingStoreTransaction, identifier, objectStoreIDs, mode), successCallback);
</span><span class="cx"> }
</span><span class="lines">@@ -334,7 +338,7 @@
</span><span class="cx"> request->completeRequest(success);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::createObjectStore(const IDBTransactionIdentifier& identifier, const WebCore::IDBObjectStoreMetadata& metadata, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::createObjectStore(const IDBTransactionIdentifier& identifier, const IDBObjectStoreMetadata& metadata, std::function<void(bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="lines">@@ -389,8 +393,31 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::deleteObjectStoreInBackingStore, requestID, identifier, objectStoreID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::openBackingStoreTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>& objectStoreIDs, WebCore::IndexedDB::TransactionMode mode)
</del><ins>+void UniqueIDBDatabase::putRecord(const IDBTransactionIdentifier& identifier, int64_t objectStoreID, const IDBKeyData& keyData, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<IDBKeyData>>& indexKeys, std::function<void(const IDBKeyData&, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><ins>+ ASSERT(isMainThread());
+
+ if (!m_acceptingNewRequests) {
+ callback(IDBKeyData(), INVALID_STATE_ERR, "Unable to put record into database because it has shut down");
+ return;
+ }
+
+ ASSERT(m_metadata->objectStores.contains(objectStoreID));
+
+ RefPtr<AsyncRequest> request = AsyncRequestImpl<const IDBKeyData&, uint32_t, const String&>::create([this, callback](const IDBKeyData& keyData, uint32_t errorCode, const String& errorMessage) {
+ callback(keyData, errorCode, errorMessage);
+ }, [this, callback]() {
+ callback(IDBKeyData(), INVALID_STATE_ERR, "Unable to put record into database");
+ });
+
+ uint64_t requestID = request->requestID();
+ m_pendingDatabaseTasks.add(requestID, request.release());
+
+ postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::putRecordInBackingStore, requestID, identifier, m_metadata->objectStores.get(objectStoreID), keyData, value.vector(), putMode, indexIDs, indexKeys));
+}
+
+void UniqueIDBDatabase::openBackingStoreTransaction(const IDBTransactionIdentifier& identifier, const Vector<int64_t>& objectStoreIDs, IndexedDB::TransactionMode mode)
+{
</ins><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="lines">@@ -469,6 +496,62 @@
</span><span class="cx"> postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didDeleteObjectStore, requestID, success));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UniqueIDBDatabase::putRecordInBackingStore(uint64_t requestID, const IDBTransactionIdentifier& transaction, const IDBObjectStoreMetadata& objectStoreMetadata, const IDBKeyData& keyData, const Vector<uint8_t>& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<IDBKeyData>>& indexKeys)
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_backingStore);
+
+ bool keyWasGenerated = false;
+ RefPtr<IDBKey> key;
+
+ if (putMode != IDBDatabaseBackend::CursorUpdate && objectStoreMetadata.autoIncrement && keyData.isNull) {
+ key = m_backingStore->generateKey(transaction, objectStoreMetadata.id);
+ keyWasGenerated = true;
+ } else
+ key = keyData.maybeCreateIDBKey();
+
+ ASSERT(key);
+ ASSERT(key->isValid());
+
+ if (putMode == IDBDatabaseBackend::AddOnly) {
+ bool keyExists;
+ if (!m_backingStore->keyExistsInObjectStore(transaction, objectStoreMetadata.id, *key, keyExists)) {
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didPutRecordInBackingStore, requestID, IDBKeyData(), IDBDatabaseException::UnknownError, ASCIILiteral("Internal backing store error checking for key existence")));
+ return;
+ }
+ if (keyExists) {
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didPutRecordInBackingStore, requestID, IDBKeyData(), IDBDatabaseException::ConstraintError, ASCIILiteral("Key already exists in the object store")));
+ return;
+ }
+ }
+
+ // FIXME: The LevelDB port performs "makeIndexWriters" here. Necessary?
+
+ if (!m_backingStore->putRecord(transaction, objectStoreMetadata.id, *key, value.data(), value.size())) {
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didPutRecordInBackingStore, requestID, IDBKeyData(), IDBDatabaseException::UnknownError, ASCIILiteral("Internal backing store error putting a record")));
+ return;
+ }
+
+ // FIXME: The LevelDB port updates index keys here. Necessary?
+
+ if (putMode != IDBDatabaseBackend::CursorUpdate && objectStoreMetadata.autoIncrement && key->type() == IDBKey::NumberType) {
+ if (!m_backingStore->updateKeyGenerator(transaction, objectStoreMetadata.id, *key, keyWasGenerated)) {
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didPutRecordInBackingStore, requestID, IDBKeyData(), IDBDatabaseException::UnknownError, ASCIILiteral("Internal backing store error updating key generator")));
+ return;
+ }
+ }
+
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didPutRecordInBackingStore, requestID, IDBKeyData(key.get()), 0, String(StringImpl::empty())));
+}
+
+void UniqueIDBDatabase::didPutRecordInBackingStore(uint64_t requestID, const IDBKeyData& keyData, uint32_t errorCode, const String& errorMessage)
+{
+ RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
+ ASSERT(request);
+
+ request->completeRequest(keyData, errorCode, errorMessage);
+}
+
</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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> struct IDBDatabaseMetadata;
</span><ins>+struct IDBKeyData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -76,6 +77,7 @@
</span><span class="cx"> void changeDatabaseVersion(const IDBTransactionIdentifier&, uint64_t newVersion, std::function<void(bool)> successCallback);
</span><span class="cx"> void createObjectStore(const IDBTransactionIdentifier&, const WebCore::IDBObjectStoreMetadata&, std::function<void(bool)> successCallback);
</span><span class="cx"> void deleteObjectStore(const IDBTransactionIdentifier&, int64_t objectStoreID, std::function<void(bool)> successCallback);
</span><ins>+ void putRecord(const IDBTransactionIdentifier&, int64_t objectStoreID, const WebCore::IDBKeyData&, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<WebCore::IDBKeyData>>& indexKeys, std::function<void(const WebCore::IDBKeyData&, uint32_t, const String&)> callback);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="lines">@@ -117,7 +119,9 @@
</span><span class="cx"> void changeDatabaseVersionInBackingStore(uint64_t requestID, const IDBTransactionIdentifier&, uint64_t newVersion);
</span><span class="cx"> void createObjectStoreInBackingStore(uint64_t requestID, const IDBTransactionIdentifier&, const WebCore::IDBObjectStoreMetadata&);
</span><span class="cx"> void deleteObjectStoreInBackingStore(uint64_t requestID, const IDBTransactionIdentifier&, int64_t objectStoreID);
</span><ins>+ void putRecordInBackingStore(uint64_t requestID, const IDBTransactionIdentifier&, const WebCore::IDBObjectStoreMetadata&, const WebCore::IDBKeyData&, const Vector<uint8_t>& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<WebCore::IDBKeyData>>& indexKeys);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> void shutdownBackingStore();
</span><span class="cx">
</span><span class="cx"> // Callbacks from the database workqueue thread, to be performed on the main thread only
</span><span class="lines">@@ -127,6 +131,7 @@
</span><span class="cx"> void didChangeDatabaseVersion(uint64_t requestID, bool success);
</span><span class="cx"> void didCreateObjectStore(uint64_t requestID, bool success);
</span><span class="cx"> void didDeleteObjectStore(uint64_t requestID, bool success);
</span><ins>+ void didPutRecordInBackingStore(uint64_t requestID, const WebCore::IDBKeyData&, uint32_t errorCode, const String& errorMessage);
</ins><span class="cx"> void didShutdownBackingStore();
</span><span class="cx"> void didCompleteBoolRequest(uint64_t requestID, bool success);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class IDBKey;
+
</ins><span class="cx"> struct IDBDatabaseMetadata;
</span><span class="cx"> struct IDBObjectStoreMetadata;
</span><span class="cx"> }
</span><span class="lines">@@ -55,6 +57,13 @@
</span><span class="cx"> virtual bool changeDatabaseVersion(const IDBTransactionIdentifier&, uint64_t newVersion) = 0;
</span><span class="cx"> virtual bool createObjectStore(const IDBTransactionIdentifier&, const WebCore::IDBObjectStoreMetadata&) = 0;
</span><span class="cx"> virtual bool deleteObjectStore(const IDBTransactionIdentifier&, int64_t objectStoreID) = 0;
</span><ins>+
+ virtual PassRefPtr<WebCore::IDBKey> generateKey(const IDBTransactionIdentifier&, int64_t objectStoreID) = 0;
+ virtual bool keyExistsInObjectStore(const IDBTransactionIdentifier&, int64_t objectStoreID, const WebCore::IDBKey&, bool& keyExists) = 0;
+ virtual bool putRecord(const IDBTransactionIdentifier&, int64_t objectStoreID, const WebCore::IDBKey&, const uint8_t* valueBuffer, size_t valueSize) = 0;
+ virtual bool updateKeyGenerator(const IDBTransactionIdentifier&, int64_t objectStoreId, const WebCore::IDBKey&, bool checkCurrent) = 0;
+
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "SQLiteIDBTransaction.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><ins>+#include <WebCore/IDBKeyData.h>
</ins><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <WebCore/SQLiteStatement.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -89,6 +90,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!m_sqliteDB->executeCommand("CREATE TABLE Records (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, key BLOB NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value BLOB NOT NULL ON CONFLICT FAIL);")) {
+ LOG_ERROR("Could not create Records table in database (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ m_sqliteDB = nullptr;
+ return nullptr;
+ }
+
</ins><span class="cx"> {
</span><span class="cx"> SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IDBDatabaseInfo VALUES ('MetadataVersion', ?);"));
</span><span class="cx"> if (sql.prepare() != SQLResultOk
</span><span class="lines">@@ -415,7 +422,61 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<IDBKey> UniqueIDBDatabaseBackingStoreSQLite::generateKey(const IDBTransactionIdentifier&, int64_t objectStoreID)
+{
+ // FIXME (<rdar://problem/15877909>): Implement
+ return nullptr;
+}
</ins><span class="cx">
</span><ins>+bool UniqueIDBDatabaseBackingStoreSQLite::keyExistsInObjectStore(const IDBTransactionIdentifier&, int64_t objectStoreID, const IDBKey&, bool& keyExists)
+{
+ // FIXME: When Get support is implemented, we need to implement this also (<rdar://problem/15779644>)
+ return false;
+}
+
+bool UniqueIDBDatabaseBackingStoreSQLite::putRecord(const IDBTransactionIdentifier& identifier, int64_t objectStoreID, const IDBKey& key, const uint8_t* valueBuffer, size_t valueSize)
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
+
+ SQLiteIDBTransaction* transaction = m_transactions.get(identifier);
+ if (!transaction || !transaction->inProgress()) {
+ LOG_ERROR("Attempt to put a record into database without an established, in-progress transaction");
+ return false;
+ }
+ if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+ LOG_ERROR("Attempt to put a record into database during read-only transaction");
+ return false;
+ }
+
+ RefPtr<SharedBuffer> keyBuffer = serializeIDBKey(key);
+ if (!keyBuffer) {
+ LOG_ERROR("Unable to serialize IDBKey to be stored in the database");
+ return false;
+ }
+ {
+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO Records VALUES (?, ?, ?);"));
+ if (sql.prepare() != SQLResultOk
+ || sql.bindInt64(1, objectStoreID) != SQLResultOk
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLResultOk
+ || sql.bindBlob(3, valueBuffer, valueSize) != SQLResultOk
+ || sql.step() != SQLResultDone) {
+ LOG_ERROR("Could not put record for object store %lli in Records table (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ return false;
+ }
+ }
+
+ return true;
+}
+
+bool UniqueIDBDatabaseBackingStoreSQLite::updateKeyGenerator(const IDBTransactionIdentifier&, int64_t objectStoreId, const IDBKey&, bool checkCurrent)
+{
+ // FIXME (<rdar://problem/15877909>): Implement
+ return false;
+}
+
+
</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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> virtual bool createObjectStore(const IDBTransactionIdentifier&, const WebCore::IDBObjectStoreMetadata&) override;
</span><span class="cx"> virtual bool deleteObjectStore(const IDBTransactionIdentifier&, int64_t objectStoreID) override;
</span><span class="cx">
</span><ins>+ virtual PassRefPtr<WebCore::IDBKey> generateKey(const IDBTransactionIdentifier&, int64_t objectStoreID) override;
+ virtual bool keyExistsInObjectStore(const IDBTransactionIdentifier&, int64_t objectStoreID, const WebCore::IDBKey&, bool& keyExists) override;
+ virtual bool putRecord(const IDBTransactionIdentifier&, int64_t objectStoreID, const WebCore::IDBKey&, const uint8_t* valueBuffer, size_t valueSize) override;
+ virtual bool updateKeyGenerator(const IDBTransactionIdentifier&, int64_t objectStoreId, const WebCore::IDBKey&, bool checkCurrent) override;
+
</ins><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2messagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -177,6 +177,7 @@
</span><span class="cx"> 'WebCore::FileChooserSettings',
</span><span class="cx"> 'WebCore::GrammarDetail',
</span><span class="cx"> 'WebCore::IDBDatabaseMetadata',
</span><ins>+ 'WebCore::IDBKeyData',
</ins><span class="cx"> 'WebCore::IDBObjectStoreMetadata',
</span><span class="cx"> 'WebCore::IdentityTransformOperation',
</span><span class="cx"> 'WebCore::KeypressCommand',
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AsyncTask.h (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncTask.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/Shared/AsyncTask.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -116,6 +116,50 @@
</span><span class="cx"> WebCore::CrossThreadCopier<P3>::copy(parameter3));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
+std::unique_ptr<AsyncTask> createAsyncTask(
+ T& callee,
+ void (T::*method)(MP1, MP2, MP3, MP4),
+ const P1& parameter1,
+ const P2& parameter2,
+ const P3& parameter3,
+ const P4& parameter4)
+{
+ return std::make_unique<AsyncTaskImpl<T, MP1, MP2, MP3, MP4>>(
+ &callee,
+ method,
+ WebCore::CrossThreadCopier<P1>::copy(parameter1),
+ WebCore::CrossThreadCopier<P2>::copy(parameter2),
+ WebCore::CrossThreadCopier<P3>::copy(parameter3),
+ WebCore::CrossThreadCopier<P4>::copy(parameter4));
+}
+
+template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
+std::unique_ptr<AsyncTask> createAsyncTask(
+ T& callee,
+ void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8),
+ const P1& parameter1,
+ const P2& parameter2,
+ const P3& parameter3,
+ const P4& parameter4,
+ const P5& parameter5,
+ const P6& parameter6,
+ const P7& parameter7,
+ const P8& parameter8)
+{
+ return std::make_unique<AsyncTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8>>(
+ &callee,
+ method,
+ WebCore::CrossThreadCopier<P1>::copy(parameter1),
+ WebCore::CrossThreadCopier<P2>::copy(parameter2),
+ WebCore::CrossThreadCopier<P3>::copy(parameter3),
+ WebCore::CrossThreadCopier<P4>::copy(parameter4),
+ WebCore::CrossThreadCopier<P5>::copy(parameter5),
+ WebCore::CrossThreadCopier<P6>::copy(parameter6),
+ WebCore::CrossThreadCopier<P7>::copy(parameter7),
+ WebCore::CrossThreadCopier<P8>::copy(parameter8));
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // AsyncTask_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/GraphicsLayer.h>
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><ins>+#include <WebCore/IDBKeyData.h>
</ins><span class="cx"> #include <WebCore/IDBKeyPath.h>
</span><span class="cx"> #include <WebCore/Image.h>
</span><span class="cx"> #include <WebCore/Length.h>
</span><span class="lines">@@ -1622,6 +1623,68 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ArgumentCoder<IDBKeyData>::encode(ArgumentEncoder& encoder, const IDBKeyData& keyData)
+{
+ encoder << keyData.isNull;
+ if (keyData.isNull)
+ return;
+
+ encoder.encodeEnum(keyData.type);
+
+ switch (keyData.type) {
+ case IDBKey::InvalidType:
+ break;
+ case IDBKey::ArrayType:
+ encoder << keyData.arrayValue;
+ break;
+ case IDBKey::StringType:
+ encoder << keyData.stringValue;
+ break;
+ case IDBKey::DateType:
+ case IDBKey::NumberType:
+ encoder << keyData.numberValue;
+ break;
+ case IDBKey::MinType:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
+bool ArgumentCoder<IDBKeyData>::decode(ArgumentDecoder& decoder, IDBKeyData& keyData)
+{
+ if (!decoder.decode(keyData.isNull))
+ return false;
+
+ if (keyData.isNull)
+ return true;
+
+ if (!decoder.decodeEnum(keyData.type))
+ return false;
+
+ switch (keyData.type) {
+ case IDBKey::InvalidType:
+ break;
+ case IDBKey::ArrayType:
+ if (!decoder.decode(keyData.arrayValue))
+ return false;
+ break;
+ case IDBKey::StringType:
+ if (!decoder.decode(keyData.stringValue))
+ return false;
+ break;
+ case IDBKey::DateType:
+ case IDBKey::NumberType:
+ if (!decoder.decode(keyData.numberValue))
+ return false;
+ break;
+ case IDBKey::MinType:
+ ASSERT_NOT_REACHED();
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> void ArgumentCoder<IDBKeyPath>::encode(ArgumentEncoder& encoder, const IDBKeyPath& keyPath)
</span><span class="cx"> {
</span><span class="cx"> encoder.encodeEnum(keyPath.type());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> struct FileChooserSettings;
</span><span class="cx"> struct IDBDatabaseMetadata;
</span><span class="cx"> struct IDBIndexMetadata;
</span><ins>+struct IDBKeyData;
</ins><span class="cx"> struct IDBObjectStoreMetadata;
</span><span class="cx"> struct Length;
</span><span class="cx"> struct GrammarDetail;
</span><span class="lines">@@ -364,6 +365,11 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::IDBIndexMetadata&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct ArgumentCoder<WebCore::IDBKeyData> {
+ static void encode(ArgumentEncoder&, const WebCore::IDBKeyData&);
+ static bool decode(ArgumentDecoder&, WebCore::IDBKeyData&);
+};
+
</ins><span class="cx"> template<> struct ArgumentCoder<WebCore::IDBKeyPath> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::IDBKeyPath&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::IDBKeyPath&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "IDBTransactionIdentifier.h"
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><ins>+#include <WebCore/IDBKeyData.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -51,6 +52,31 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<uint8_t> CrossThreadCopierBase<false, false, Vector<uint8_t>>::copy(const Vector<uint8_t>& vector)
+{
+ Vector<uint8_t> result;
+ result.appendVector(vector);
+ return result;
+}
+
+Vector<Vector<IDBKeyData>> CrossThreadCopierBase<false, false, Vector<Vector<IDBKeyData>>>::copy(const Vector<Vector<IDBKeyData>>& vector)
+{
+ Vector<Vector<IDBKeyData>> result;
+
+ for (auto keys : vector) {
+ result.append(Vector<IDBKeyData>());
+ for (auto key : keys)
+ result.last().append(WebCore::CrossThreadCopier<IDBKeyData>::copy(key));
+ }
+
+ return result;
+}
+
+ASCIILiteral CrossThreadCopierBase<false, false, ASCIILiteral>::copy(const ASCIILiteral& literal)
+{
+ return literal;
+}
+
</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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> class UniqueIDBDatabaseIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace WTF {
+class ASCIILiteral;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> template<> struct CrossThreadCopierBase<false, false, WebKit::UniqueIDBDatabaseIdentifier> {
</span><span class="lines">@@ -50,6 +54,18 @@
</span><span class="cx"> static Vector<int64_t> copy(const Vector<int64_t>&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct CrossThreadCopierBase<false, false, Vector<uint8_t>> {
+ static Vector<uint8_t> copy(const Vector<uint8_t>&);
+};
+
+template<> struct CrossThreadCopierBase<false, false, Vector<Vector<IDBKeyData>>> {
+ static Vector<Vector<IDBKeyData>> copy(const Vector<Vector<IDBKeyData>>&);
+};
+
+template<> struct CrossThreadCopierBase<false, false, WTF::ASCIILiteral> {
+ static WTF::ASCIILiteral copy(const WTF::ASCIILiteral&);
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><span class="cx"> #include "AsyncRequest.h"
</span><ins>+#include "DataReference.h"
</ins><span class="cx"> #include "DatabaseProcessIDBConnectionMessages.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnectionMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -300,10 +301,47 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::put(IDBTransactionBackend&, const PutOperation&, std::function<void(PassRefPtr<IDBKey>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::put(IDBTransactionBackend& transaction, const PutOperation& operation, std::function<void(PassRefPtr<IDBKey>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><ins>+ RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBKey>, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
+
+ serverRequest->setAbortHandler([completionCallback]() {
+ completionCallback(nullptr, IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured putting record"));
+ });
+
+ uint64_t requestID = serverRequest->requestID();
+ ASSERT(!m_serverRequests.contains(requestID));
+ m_serverRequests.add(requestID, serverRequest.release());
+
+ LOG(IDB, "WebProcess put request ID %llu", requestID);
+
+ ASSERT(operation.key());
+ ASSERT(operation.value());
+
+ IPC::DataReference value(reinterpret_cast<const uint8_t*>(operation.value()->data()), operation.value()->size());
+
+ Vector<Vector<IDBKeyData>> indexKeys;
+ for (auto keys : operation.indexKeys()) {
+ indexKeys.append(Vector<IDBKeyData>());
+ for (auto key : keys)
+ indexKeys.last().append(IDBKeyData(key.get()));
+ }
+
+ send(Messages::DatabaseProcessIDBConnection::PutRecord(requestID, transaction.id(), operation.objectStore().id, IDBKeyData(operation.key()), value, operation.putMode(), operation.indexIDs(), indexKeys));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebIDBServerConnection::didPutRecord(uint64_t requestID, const WebCore::IDBKeyData& resultKey, uint32_t errorCode, const String& errorMessage)
+{
+ LOG(IDB, "WebProcess didPutRecord request ID %llu (error - %s)", requestID, errorMessage.utf8().data());
+
+ RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
+
+ if (!serverRequest)
+ return;
+
+ serverRequest->completeRequest(resultKey.isNull ? nullptr : resultKey.maybeCreateIDBKey(), errorCode ? IDBDatabaseError::create(errorCode, errorMessage) : nullptr);
+}
+
</ins><span class="cx"> void WebIDBServerConnection::openCursor(IDBTransactionBackend&, const OpenCursorOperation&, 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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -33,6 +33,10 @@
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><span class="cx"> #include <WebCore/IDBServerConnection.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+struct IDBKeyData;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class AsyncRequest;
</span><span class="lines">@@ -102,6 +106,7 @@
</span><span class="cx"> void didChangeDatabaseVersion(uint64_t requestID, bool success);
</span><span class="cx"> void didCreateObjectStore(uint64_t requestID, bool success);
</span><span class="cx"> void didDeleteObjectStore(uint64_t requestID, bool success);
</span><ins>+ void didPutRecord(uint64_t requestID, const WebCore::IDBKeyData&, uint32_t errorCode, const String& errorMessage);
</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 (162565 => 162566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2014-01-22 23:47:24 UTC (rev 162565)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.messages.in 2014-01-22 23:48:27 UTC (rev 162566)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> DidChangeDatabaseVersion(uint64_t requestID, bool success)
</span><span class="cx"> DidCreateObjectStore(uint64_t requestID, bool success)
</span><span class="cx"> DidDeleteObjectStore(uint64_t requestID, bool success)
</span><ins>+ DidPutRecord(uint64_t requestID, WebCore::IDBKeyData resultKey, uint32_t errorCode, String errorMessage)
</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>