<!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>[160517] 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/160517">160517</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 16:42:14 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>DatabaseProcess IndexedDB: Establish a metadata backing store on disk
https://bugs.webkit.org/show_bug.cgi?id=125258
Reviewed by Alexey Proskuryakov, Anders Carlsson, and Tim Horton.
Source/WebCore:
Teach CrossThreadCopier how to handle IDBDatabaseMetadata.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
* Modules/indexeddb/IDBDatabaseMetadata.cpp: Added.
(WebCore::IDBDatabaseMetadata::isolatedCopy):
(WebCore::IDBObjectStoreMetadata::isolatedCopy):
(WebCore::IDBIndexMetadata::isolatedCopy):
* Modules/indexeddb/IDBDatabaseMetadata.h:
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::IDBKeyPath::isolatedCopy):
* Modules/indexeddb/IDBKeyPath.h:
* platform/CrossThreadCopier.cpp:
(WebCore::::copy): Add an IDBDatabaseMetadata specialization.
* platform/CrossThreadCopier.h:
Source/WebKit2:
The DatabaseProcess already has an "Indexed Database path".
Each SecurityOrigin with indexed databases will have a subdirectory under the path.
Each indexed database will have a subdirectory under its SecurityOrigin's path.
Inside that directory will exist (1) metadata database, and 0-N ObjectStore databases.
This patch establishes the directory structure and the (1) metadata database.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::initializeDatabaseProcess): Asynchronously ensure the indexed database directory exists.
(WebKit::DatabaseProcess::ensureIndexedDatabaseRelativePathExists): Allow anyone to make necessary directories relative to
the indexed database directory.
(WebKit::DatabaseProcess::ensurePathExists):
(WebKit::DatabaseProcess::absoluteIndexedDatabasePathFromDatabaseRelativePath): Instead of exposing the indexed database directory,
give DatabaseProcess a method to allow others to compute a path relative to the indexed database directory.
(WebKit::DatabaseProcess::postDatabaseTask):
(WebKit::DatabaseProcess::performNextDatabaseTask):
* DatabaseProcess/DatabaseProcess.h:
(WebKit::DatabaseProcess::queue):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::UniqueIDBDatabase):
(WebKit::UniqueIDBDatabase::filenameForDatabaseName):
(WebKit::UniqueIDBDatabase::databaseFilenameIdentifier):
(WebKit::UniqueIDBDatabase::canShareDatabases):
(WebKit::UniqueIDBDatabase::shutdown): Method to cleanly shutdown a database, emptying its task and request queues.
(WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata):
(WebKit::UniqueIDBDatabase::openBackingStoreAndReadMetadata): To be run on the database work queue, establishes a backing store
and extracts metadata from it.
(WebKit::UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata): Callback once metadata from the backing store is ready for use.
(WebKit::UniqueIDBDatabase::absoluteDatabaseDirectory):
(WebKit::UniqueIDBDatabase::postMainThreadTask): Add a main thread task for this database.
(WebKit::UniqueIDBDatabase::performNextMainThreadTask):
(WebKit::UniqueIDBDatabase::postDatabaseTask): Add a database queue task for this database.
(WebKit::UniqueIDBDatabase::performNextDatabaseTask):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
Add a virtual backing store interface:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h:
(WebKit::UniqueIDBDatabaseBackingStore::~UniqueIDBDatabaseBackingStore):
Add a SQLite implementation of that interface:
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp: Added.
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
Add a general purpose asynchronous task that does cross thread copying:
* Shared/AsyncTask.h: Added.
(WebKit::AsyncTask::~AsyncTask):
(WebKit::AsyncTask::AsyncTask):
(WebKit::createAsyncTask):
Add more isolated copiers and introduce WebKit CrossThreadCopier specializations:
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp:
(WebKit::UniqueIDBDatabaseIdentifier::isolatedCopy):
* DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h:
* Shared/SecurityOriginData.cpp:
(WebKit::SecurityOriginData::isolatedCopy):
* Shared/SecurityOriginData.h:
* Shared/WebCrossThreadCopier.cpp:
(WebCore::::copy):
* Shared/WebCrossThreadCopier.h:
* WebKit2.xcodeproj/project.pbxproj:
Source/WTF:
* wtf/text/WTFString.h: Export toUInt64Strict().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<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="#trunkSourceWebCoreModulesindexeddbIDBDatabaseMetadatah">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathh">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.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="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifiercpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifierh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatacpp">trunk/Source/WebKit2/Shared/SecurityOriginData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatah">trunk/Source/WebKit2/Shared/SecurityOriginData.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBDatabaseMetadatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStoreh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h</a></li>
<li>trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/</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="#trunkSourceWebKit2SharedAsyncTaskh">trunk/Source/WebKit2/Shared/AsyncTask.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WTF/ChangeLog 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-12 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess IndexedDB: Establish a metadata backing store on disk
+ https://bugs.webkit.org/show_bug.cgi?id=125258
+
+ Reviewed by Alexey Proskuryakov, Anders Carlsson, and Tim Horton.
+
+ * wtf/text/WTFString.h: Export toUInt64Strict().
+
</ins><span class="cx"> 2013-12-12 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Replace uses of WTF::BitArray with std::bitset
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> WTF_EXPORT_STRING_API int toIntStrict(bool* ok = 0, int base = 10) const;
</span><span class="cx"> WTF_EXPORT_STRING_API unsigned toUIntStrict(bool* ok = 0, int base = 10) const;
</span><span class="cx"> WTF_EXPORT_STRING_API int64_t toInt64Strict(bool* ok = 0, int base = 10) const;
</span><del>- uint64_t toUInt64Strict(bool* ok = 0, int base = 10) const;
</del><ins>+ WTF_EXPORT_STRING_API uint64_t toUInt64Strict(bool* ok = 0, int base = 10) const;
</ins><span class="cx"> intptr_t toIntPtrStrict(bool* ok = 0, int base = 10) const;
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_STRING_API int toInt(bool* ok = 0) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -800,6 +800,7 @@
</span><span class="cx"> Modules/indexeddb/IDBDatabaseBackend.cpp
</span><span class="cx"> Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp
</span><span class="cx"> Modules/indexeddb/IDBDatabaseException.cpp
</span><ins>+ Modules/indexeddb/IDBDatabaseMetadata.cpp
</ins><span class="cx"> Modules/indexeddb/IDBEventDispatcher.cpp
</span><span class="cx"> Modules/indexeddb/IDBFactory.cpp
</span><span class="cx"> Modules/indexeddb/IDBFactoryBackendInterface.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/ChangeLog 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-12 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess IndexedDB: Establish a metadata backing store on disk
+ https://bugs.webkit.org/show_bug.cgi?id=125258
+
+ Reviewed by Alexey Proskuryakov, Anders Carlsson, and Tim Horton.
+
+ Teach CrossThreadCopier how to handle IDBDatabaseMetadata.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+
+ * Modules/indexeddb/IDBDatabaseMetadata.cpp: Added.
+ (WebCore::IDBDatabaseMetadata::isolatedCopy):
+ (WebCore::IDBObjectStoreMetadata::isolatedCopy):
+ (WebCore::IDBIndexMetadata::isolatedCopy):
+ * Modules/indexeddb/IDBDatabaseMetadata.h:
+
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::IDBKeyPath::isolatedCopy):
+ * Modules/indexeddb/IDBKeyPath.h:
+
+ * platform/CrossThreadCopier.cpp:
+ (WebCore::::copy): Add an IDBDatabaseMetadata specialization.
+ * platform/CrossThreadCopier.h:
+
</ins><span class="cx"> 2013-12-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for RSAES-PKCS1-v1_5
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -1827,6 +1827,7 @@
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBDatabaseError.h \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBDatabaseException.h \
</span><ins>+ Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.cpp \
</ins><span class="cx"> Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBEventDispatcher.cpp \
</span><span class="cx"> Source/WebCore/Modules/indexeddb/IDBEventDispatcher.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseMetadatacpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.cpp (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "IDBDatabaseMetadata.h"
+
+#if ENABLE(INDEXED_DATABASE)
+
+namespace WebCore {
+
+IDBDatabaseMetadata IDBDatabaseMetadata::isolatedCopy() const
+{
+ IDBDatabaseMetadata result;
+ result.id = id;
+ result.version = version;
+ result.maxObjectStoreId = maxObjectStoreId;
+
+ result.name = name.isolatedCopy();
+
+ for (auto i = objectStores.begin(), end = objectStores.end(); i != end; ++i)
+ result.objectStores.set(i->key, i->value.isolatedCopy());
+
+ return result;
+}
+
+IDBObjectStoreMetadata IDBObjectStoreMetadata::isolatedCopy() const
+{
+ IDBObjectStoreMetadata result;
+ result.id = id;
+ result.autoIncrement = autoIncrement;
+ result.maxIndexId = maxIndexId;
+
+ result.name = name.isolatedCopy();
+ result.keyPath = keyPath.isolatedCopy();
+
+ for (auto i = indexes.begin(), end = indexes.end(); i != end; ++i)
+ result.indexes.set(i->key, i->value.isolatedCopy());
+
+ return result;
+}
+
+IDBIndexMetadata IDBIndexMetadata::isolatedCopy() const
+{
+ IDBIndexMetadata result;
+ result.id = id;
+ result.unique = unique;
+ result.multiEntry = multiEntry;
+
+ result.name = name.isolatedCopy();
+ result.keyPath = keyPath.isolatedCopy();
+
+ return result;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBDatabaseMetadatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseMetadata.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> bool unique;
</span><span class="cx"> bool multiEntry;
</span><span class="cx">
</span><ins>+ IDBIndexMetadata isolatedCopy() const;
+
</ins><span class="cx"> static const int64_t InvalidId = -1;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -77,6 +79,7 @@
</span><span class="cx"> typedef HashMap<int64_t, IDBIndexMetadata> IndexMap;
</span><span class="cx"> IndexMap indexes;
</span><span class="cx">
</span><ins>+ IDBObjectStoreMetadata isolatedCopy() const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct IDBDatabaseMetadata {
</span><span class="lines">@@ -120,6 +123,8 @@
</span><span class="cx"> int64_t maxObjectStoreId;
</span><span class="cx">
</span><span class="cx"> ObjectStoreMap objectStores;
</span><ins>+
+ IDBDatabaseMetadata isolatedCopy() const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -248,7 +248,19 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBKeyPath IDBKeyPath::isolatedCopy() const
+{
+ IDBKeyPath result;
+ result.m_type = m_type;
+ result.m_string = m_string.isolatedCopy();
</ins><span class="cx">
</span><ins>+ result.m_array.reserveInitialCapacity(m_array.size());
+ for (size_t i = 0; i < m_array.size(); ++i)
+ result.m_array.uncheckedAppend(m_array[i].isolatedCopy());
+
+ return result;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> bool isValid() const;
</span><span class="cx"> bool operator==(const IDBKeyPath& other) const;
</span><span class="cx">
</span><ins>+ IDBKeyPath isolatedCopy() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> Type m_type;
</span><span class="cx"> String m_string;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -367,9 +367,11 @@
</span><span class="cx"> __ZN7WebCore14ResourceLoader32didCancelAuthenticationChallengeERKNS_23AuthenticationChallengeE
</span><span class="cx"> __ZN7WebCore14ResourceLoader6cancelEv
</span><span class="cx"> __ZN7WebCore14SQLiteDatabase11tableExistsERKN3WTF6StringE
</span><ins>+__ZN7WebCore14SQLiteDatabase12lastErrorMsgEv
</ins><span class="cx"> __ZN7WebCore14SQLiteDatabase14executeCommandERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore14SQLiteDatabase4openERKN3WTF6StringEb
</span><span class="cx"> __ZN7WebCore14SQLiteDatabase5closeEv
</span><ins>+__ZN7WebCore14SQLiteDatabase9lastErrorEv
</ins><span class="cx"> __ZN7WebCore14SQLiteDatabaseC1Ev
</span><span class="cx"> __ZN7WebCore14SQLiteDatabaseD1Ev
</span><span class="cx"> __ZN7WebCore14SchemeRegistry24registerURLSchemeAsLocalERKN3WTF6StringE
</span><span class="lines">@@ -574,12 +576,14 @@
</span><span class="cx"> __ZN7WebCore15ResourceRequest21httpPipeliningEnabledEv
</span><span class="cx"> __ZN7WebCore15ResourceRequest24setHTTPPipeliningEnabledEb
</span><span class="cx"> __ZN7WebCore15SQLiteStatement12getColumnIntEi
</span><ins>+__ZN7WebCore15SQLiteStatement12isColumnNullEi
</ins><span class="cx"> __ZN7WebCore15SQLiteStatement13getColumnTextEi
</span><span class="cx"> __ZN7WebCore15SQLiteStatement14executeCommandEv
</span><span class="cx"> __ZN7WebCore15SQLiteStatement21getColumnBlobAsStringEi
</span><span class="cx"> __ZN7WebCore15SQLiteStatement22isColumnDeclaredAsBlobEi
</span><span class="cx"> __ZN7WebCore15SQLiteStatement4stepEv
</span><span class="cx"> __ZN7WebCore15SQLiteStatement5resetEv
</span><ins>+__ZN7WebCore15SQLiteStatement7bindIntEii
</ins><span class="cx"> __ZN7WebCore15SQLiteStatement7prepareEv
</span><span class="cx"> __ZN7WebCore15SQLiteStatement8bindBlobEiRKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore15SQLiteStatement8bindTextEiRKN3WTF6StringE
</span><span class="lines">@@ -694,6 +698,7 @@
</span><span class="cx"> __ZN7WebCore17SubresourceLoader6createEPNS_5FrameEPNS_14CachedResourceERKNS_15ResourceRequestERKNS_21ResourceLoaderOptionsE
</span><span class="cx"> __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
</span><span class="cx"> __ZN7WebCore17drawLayerContentsEP9CGContextPNS_15PlatformCALayerERN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE
</span><ins>+__ZN7WebCore17encodeForFileNameERKN3WTF6StringE
</ins><span class="cx"> __ZN7WebCore17languageDidChangeEv
</span><span class="cx"> __ZN7WebCore17openTemporaryFileERKN3WTF6StringERi
</span><span class="cx"> __ZN7WebCore17setCookiesFromDOMERKNS_21NetworkStorageSessionERKNS_3URLES5_RKN3WTF6StringE
</span><span class="lines">@@ -788,6 +793,8 @@
</span><span class="cx"> __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore20toUInt32EnforceRangeEPN3JSC9ExecStateENS0_7JSValueE
</span><span class="cx"> __ZN7WebCore21BackForwardController11itemAtIndexEi
</span><ins>+__ZN7WebCore21CrossThreadCopierBaseILb0ELb0EN3WTF6StringEE4copyERKS2_
+__ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_19IDBDatabaseMetadataEE4copyERKS1_
</ins><span class="cx"> __ZN7WebCore21MemoryPressureHandler7installEv
</span><span class="cx"> __ZN7WebCore21NetworkStorageSession21defaultStorageSessionEv
</span><span class="cx"> __ZN7WebCore21NetworkStorageSession25switchToNewTestingSessionEv
</span><span class="lines">@@ -1591,6 +1598,7 @@
</span><span class="cx"> __ZNK7WebCore19AnimationController11isSuspendedEv
</span><span class="cx"> __ZNK7WebCore19AnimationController24numberOfActiveAnimationsEPNS_8DocumentE
</span><span class="cx"> __ZNK7WebCore19AnimationController33allowsNewAnimationsWhileSuspendedEv
</span><ins>+__ZNK7WebCore19IDBDatabaseMetadata12isolatedCopyEv
</ins><span class="cx"> __ZNK7WebCore19InspectorController12getHighlightEPNS_9HighlightE
</span><span class="cx"> __ZNK7WebCore19InspectorController29buildObjectForHighlightedNodeEv
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase10httpMethodEv
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> 2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346420F546A8200B0F1BA /* WorkerThread.cpp */; };
</span><span class="cx"> 2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346430F546A8200B0F1BA /* WorkerThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2E4346580F546A9900B0F1BA /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346560F546A9900B0F1BA /* CrossThreadCopier.cpp */; };
</span><del>- 2E4346590F546A9900B0F1BA /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */; };
</del><ins>+ 2E4346590F546A9900B0F1BA /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346570F546A9900B0F1BA /* CrossThreadCopier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 2E7582EE12764F260062628B /* JSFileReaderCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E7582ED12764F260062628B /* JSFileReaderCustom.cpp */; };
</span><span class="cx"> 2E75841D12779ADA0062628B /* FileReaderLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E75841A12779ADA0062628B /* FileReaderLoader.cpp */; };
</span><span class="cx"> 2E75841E12779ADA0062628B /* FileReaderLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E75841B12779ADA0062628B /* FileReaderLoader.h */; };
</span><span class="lines">@@ -1749,6 +1749,7 @@
</span><span class="cx"> 5160F4980B0AA75F00C1D2AF /* HistoryItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */; };
</span><span class="cx"> 5162C7F411F77EFB00612EFE /* SchemeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5162C7F211F77EFA00612EFE /* SchemeRegistry.cpp */; };
</span><span class="cx"> 5162C7F511F77EFB00612EFE /* SchemeRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 5162C7F311F77EFB00612EFE /* SchemeRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 5163117D1851242B00534647 /* IDBDatabaseMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5163117C1851242B00534647 /* IDBDatabaseMetadata.cpp */; };
</ins><span class="cx"> 5164ED43183208C700EA8FF1 /* IDBServerConnectionLevelDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5164ED41183208C700EA8FF1 /* IDBServerConnectionLevelDB.cpp */; };
</span><span class="cx"> 5164ED44183208C700EA8FF1 /* IDBServerConnectionLevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 5164ED42183208C700EA8FF1 /* IDBServerConnectionLevelDB.h */; };
</span><span class="cx"> 51660AB61828BB8200074CAD /* IDBBackingStoreLevelDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51660AB01828BB8200074CAD /* IDBBackingStoreLevelDB.cpp */; };
</span><span class="lines">@@ -8497,6 +8498,7 @@
</span><span class="cx"> 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = HistoryItemMac.mm; path = mac/HistoryItemMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5162C7F211F77EFA00612EFE /* SchemeRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchemeRegistry.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5162C7F311F77EFB00612EFE /* SchemeRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchemeRegistry.h; sourceTree = "<group>"; };
</span><ins>+ 5163117C1851242B00534647 /* IDBDatabaseMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBDatabaseMetadata.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 5164ED41183208C700EA8FF1 /* IDBServerConnectionLevelDB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBServerConnectionLevelDB.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5164ED42183208C700EA8FF1 /* IDBServerConnectionLevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBServerConnectionLevelDB.h; sourceTree = "<group>"; };
</span><span class="cx"> 51660AB01828BB8200074CAD /* IDBBackingStoreLevelDB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBBackingStoreLevelDB.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17136,6 +17138,7 @@
</span><span class="cx"> 51D71983181106DF0016DC51 /* IDBDatabaseError.h */,
</span><span class="cx"> 51D71984181106DF0016DC51 /* IDBDatabaseException.cpp */,
</span><span class="cx"> 51D71985181106DF0016DC51 /* IDBDatabaseException.h */,
</span><ins>+ 5163117C1851242B00534647 /* IDBDatabaseMetadata.cpp */,
</ins><span class="cx"> 51C9611A183D2B8000D2002E /* IDBDatabaseMetadata.h */,
</span><span class="cx"> 51D71986181106DF0016DC51 /* IDBEventDispatcher.cpp */,
</span><span class="cx"> 51D71987181106DF0016DC51 /* IDBEventDispatcher.h */,
</span><span class="lines">@@ -28219,6 +28222,7 @@
</span><span class="cx"> B2AFFC990D00A5DF0030074D /* TextCodecMac.cpp in Sources */,
</span><span class="cx"> B2C3DA3F0D006C1D00EF6F26 /* TextCodecUserDefined.cpp in Sources */,
</span><span class="cx"> E1233F10185A4130008DFAF5 /* CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp in Sources */,
</span><ins>+ 5163117D1851242B00534647 /* IDBDatabaseMetadata.cpp in Sources */,
</ins><span class="cx"> B2C3DA410D006C1D00EF6F26 /* TextCodecUTF16.cpp in Sources */,
</span><span class="cx"> E1FF8F6C180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp in Sources */,
</span><span class="cx"> 9343CB8112F25E510033C5EE /* TextCodecUTF8.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.cpp (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -40,6 +40,10 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+#include "IDBDatabaseMetadata.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> CrossThreadCopierBase<false, false, URL>::Type CrossThreadCopierBase<false, false, URL>::copy(const URL& url)
</span><span class="lines">@@ -67,6 +71,15 @@
</span><span class="cx"> return response.copyData();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+
+CrossThreadCopierBase<false, false, IDBDatabaseMetadata>::Type CrossThreadCopierBase<false, false, IDBDatabaseMetadata>::copy(const IDBDatabaseMetadata& metadata)
+{
+ return metadata.isolatedCopy();
+}
+
+#endif
+
</ins><span class="cx"> // Test CrossThreadCopier using COMPILE_ASSERT.
</span><span class="cx">
</span><span class="cx"> // Verify that ThreadSafeRefCounted objects get handled correctly.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadCopier.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadCopier.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebCore/platform/CrossThreadCopier.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -145,6 +145,14 @@
</span><span class="cx"> static Type copy(const ResourceResponse&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+ struct IDBDatabaseMetadata;
+ template<> struct CrossThreadCopierBase<false, false, IDBDatabaseMetadata> {
+ typedef IDBDatabaseMetadata Type;
+ static Type copy(const IDBDatabaseMetadata&);
+ };
+#endif
+
</ins><span class="cx"> template<typename T>
</span><span class="cx"> struct CrossThreadCopier : public CrossThreadCopierBase<CrossThreadCopierBaseHelper::IsConvertibleToInteger<T>::value, CrossThreadCopierBaseHelper::IsThreadSafeRefCountedPointer<T>::value, T> {
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -1,3 +1,83 @@
</span><ins>+2013-12-12 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess IndexedDB: Establish a metadata backing store on disk
+ https://bugs.webkit.org/show_bug.cgi?id=125258
+
+ Reviewed by Alexey Proskuryakov, Anders Carlsson, and Tim Horton.
+
+ The DatabaseProcess already has an "Indexed Database path".
+ Each SecurityOrigin with indexed databases will have a subdirectory under the path.
+ Each indexed database will have a subdirectory under its SecurityOrigin's path.
+ Inside that directory will exist (1) metadata database, and 0-N ObjectStore databases.
+
+ This patch establishes the directory structure and the (1) metadata database.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::initializeDatabaseProcess): Asynchronously ensure the indexed database directory exists.
+ (WebKit::DatabaseProcess::ensureIndexedDatabaseRelativePathExists): Allow anyone to make necessary directories relative to
+ the indexed database directory.
+ (WebKit::DatabaseProcess::ensurePathExists):
+ (WebKit::DatabaseProcess::absoluteIndexedDatabasePathFromDatabaseRelativePath): Instead of exposing the indexed database directory,
+ give DatabaseProcess a method to allow others to compute a path relative to the indexed database directory.
+ (WebKit::DatabaseProcess::postDatabaseTask):
+ (WebKit::DatabaseProcess::performNextDatabaseTask):
+ * DatabaseProcess/DatabaseProcess.h:
+ (WebKit::DatabaseProcess::queue):
+
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata):
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::UniqueIDBDatabase):
+ (WebKit::UniqueIDBDatabase::filenameForDatabaseName):
+ (WebKit::UniqueIDBDatabase::databaseFilenameIdentifier):
+ (WebKit::UniqueIDBDatabase::canShareDatabases):
+ (WebKit::UniqueIDBDatabase::shutdown): Method to cleanly shutdown a database, emptying its task and request queues.
+ (WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata):
+ (WebKit::UniqueIDBDatabase::openBackingStoreAndReadMetadata): To be run on the database work queue, establishes a backing store
+ and extracts metadata from it.
+ (WebKit::UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata): Callback once metadata from the backing store is ready for use.
+ (WebKit::UniqueIDBDatabase::absoluteDatabaseDirectory):
+ (WebKit::UniqueIDBDatabase::postMainThreadTask): Add a main thread task for this database.
+ (WebKit::UniqueIDBDatabase::performNextMainThreadTask):
+ (WebKit::UniqueIDBDatabase::postDatabaseTask): Add a database queue task for this database.
+ (WebKit::UniqueIDBDatabase::performNextDatabaseTask):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ Add a virtual backing store interface:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h:
+ (WebKit::UniqueIDBDatabaseBackingStore::~UniqueIDBDatabaseBackingStore):
+
+ Add a SQLite implementation of that interface:
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp: Added.
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
+
+ Add a general purpose asynchronous task that does cross thread copying:
+ * Shared/AsyncTask.h: Added.
+ (WebKit::AsyncTask::~AsyncTask):
+ (WebKit::AsyncTask::AsyncTask):
+ (WebKit::createAsyncTask):
+
+ Add more isolated copiers and introduce WebKit CrossThreadCopier specializations:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp:
+ (WebKit::UniqueIDBDatabaseIdentifier::isolatedCopy):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h:
+
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::SecurityOriginData::isolatedCopy):
+ * Shared/SecurityOriginData.h:
+
+ * Shared/WebCrossThreadCopier.cpp:
+ (WebCore::::copy):
+ * Shared/WebCrossThreadCopier.h:
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2013-12-12 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: HANG: virginamerica.com: Pressing the print button on the boarding pass page locks up VoiceOver and Safari.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -28,11 +28,16 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "AsyncTask.h"
</ins><span class="cx"> #include "DatabaseProcessCreationParameters.h"
</span><span class="cx"> #include "DatabaseProcessProxyMessages.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><span class="cx"> #include "UniqueIDBDatabase.h"
</span><ins>+#include <WebCore/FileSystem.h>
+#include <wtf/MainThread.h>
</ins><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> DatabaseProcess& DatabaseProcess::shared()
</span><span class="lines">@@ -87,15 +92,61 @@
</span><span class="cx"> const UniqueIDBDatabaseIdentifier& identifier = database.identifier();
</span><span class="cx"> ASSERT(m_idbDatabases.contains(identifier));
</span><span class="cx">
</span><del>- // FIXME: Perform necessary shut down of the unique database before it is actually destroyed.
</del><span class="cx"> m_idbDatabases.remove(identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::initializeDatabaseProcess(const DatabaseProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> m_indexedDatabaseDirectory = parameters.indexedDatabaseDirectory;
</span><ins>+
+ ensureIndexedDatabaseRelativePathExists(StringImpl::empty());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcess::ensureIndexedDatabaseRelativePathExists(const String& relativePath)
+{
+ postDatabaseTask(createAsyncTask(*this, &DatabaseProcess::ensurePathExists, absoluteIndexedDatabasePathFromDatabaseRelativePath(relativePath)));
+}
+
+void DatabaseProcess::ensurePathExists(const String& path)
+{
+ ASSERT(!isMainThread());
+
+ if (!makeAllDirectories(path))
+ LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
+}
+
+String DatabaseProcess::absoluteIndexedDatabasePathFromDatabaseRelativePath(const String& relativePath)
+{
+ // FIXME: pathByAppendingComponent() was originally designed to append individual atomic components.
+ // We don't have a function designed to append a multi-component subpath, but we should.
+ return pathByAppendingComponent(m_indexedDatabaseDirectory, relativePath);
+}
+
+void DatabaseProcess::postDatabaseTask(std::unique_ptr<AsyncTask> task)
+{
+ ASSERT(isMainThread());
+
+ MutexLocker locker(m_databaseTaskMutex);
+
+ m_databaseTasks.append(std::move(task));
+
+ m_queue->dispatch(bind(&DatabaseProcess::performNextDatabaseTask, this));
+}
+
+void DatabaseProcess::performNextDatabaseTask()
+{
+ ASSERT(!isMainThread());
+
+ std::unique_ptr<AsyncTask> task;
+ {
+ MutexLocker locker(m_databaseTaskMutex);
+ ASSERT(!m_databaseTasks.isEmpty());
+ task = m_databaseTasks.takeFirst();
+ }
+
+ task->performTask();
+}
+
</ins><span class="cx"> void DatabaseProcess::createDatabaseToWebProcessConnection()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class AsyncTask;
</ins><span class="cx"> class DatabaseToWebProcessConnection;
</span><span class="cx"> class UniqueIDBDatabase;
</span><span class="cx">
</span><span class="lines">@@ -50,8 +51,11 @@
</span><span class="cx"> PassRefPtr<UniqueIDBDatabase> getOrCreateUniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="cx"> void removeUniqueIDBDatabase(const UniqueIDBDatabase&);
</span><span class="cx">
</span><del>- WorkQueue& queue() const { return const_cast<WorkQueue&>(m_queue.get()); }
</del><ins>+ void ensureIndexedDatabaseRelativePathExists(const String&);
+ String absoluteIndexedDatabasePathFromDatabaseRelativePath(const String&);
</ins><span class="cx">
</span><ins>+ WorkQueue& queue() { return m_queue.get(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> DatabaseProcess();
</span><span class="cx"> ~DatabaseProcess();
</span><span class="lines">@@ -72,6 +76,12 @@
</span><span class="cx"> void initializeDatabaseProcess(const DatabaseProcessCreationParameters&);
</span><span class="cx"> void createDatabaseToWebProcessConnection();
</span><span class="cx">
</span><ins>+ void postDatabaseTask(std::unique_ptr<AsyncTask>);
+
+ // For execution on work queue thread only
+ void performNextDatabaseTask();
+ void ensurePathExists(const String&);
+
</ins><span class="cx"> Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
</span><span class="cx">
</span><span class="cx"> Ref<WorkQueue> m_queue;
</span><span class="lines">@@ -79,6 +89,9 @@
</span><span class="cx"> String m_indexedDatabaseDirectory;
</span><span class="cx">
</span><span class="cx"> HashMap<UniqueIDBDatabaseIdentifier, RefPtr<UniqueIDBDatabase>> m_idbDatabases;
</span><ins>+
+ Deque<std::unique_ptr<AsyncTask>> m_databaseTasks;
+ Mutex m_databaseTaskMutex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -29,8 +29,12 @@
</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 "AsyncTask.h"
</ins><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx"> #include "DatabaseProcessIDBConnection.h"
</span><ins>+#include "UniqueIDBDatabaseBackingStoreSQLite.h"
+#include "WebCrossThreadCopier.h"
+#include <WebCore/FileSystem.h>
</ins><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="lines">@@ -40,14 +44,51 @@
</span><span class="cx">
</span><span class="cx"> UniqueIDBDatabase::UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier& identifier)
</span><span class="cx"> : m_identifier(identifier)
</span><del>- , m_processingDatabaseQueueRequests(false)
</del><ins>+ , m_acceptingNewRequests(true)
+ , m_didGetMetadataFromBackingStore(false)
</ins><span class="cx"> {
</span><ins>+ m_inMemory = !canShareDatabases(identifier.openingOrigin(), identifier.mainFrameOrigin());
+ if (m_inMemory)
+ return;
+
+ // Each unique Indexed Database exists in a directory named for the database, which exists in a directory representing its opening origin.
+ m_databaseRelativeDirectory = pathByAppendingComponent(databaseFilenameIdentifier(identifier.openingOrigin()), filenameForDatabaseName());
+
+ DatabaseProcess::shared().ensureIndexedDatabaseRelativePathExists(m_databaseRelativeDirectory);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UniqueIDBDatabase::~UniqueIDBDatabase()
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_acceptingNewRequests);
+ ASSERT(m_pendingMetadataRequests.isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+String UniqueIDBDatabase::filenameForDatabaseName() const
+{
+ ASSERT(!m_identifier.databaseName().isNull());
+
+ if (m_identifier.databaseName().isEmpty())
+ return "%00";
+
+ String filename = encodeForFileName(m_identifier.databaseName());
+ filename.replace('.', "%2E");
+
+ return filename;
+}
+
+String UniqueIDBDatabase::databaseFilenameIdentifier(const SecurityOriginData& originData) const
+{
+ RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
+ return securityOrigin->databaseIdentifier();
+}
+
+bool UniqueIDBDatabase::canShareDatabases(const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin) const
+{
+ // For now, an origin's database access is predicated on equality with the other origin.
+ // We might need to make this more nuanced later.
+ return openingOrigin == mainFrameOrigin;
+}
+
</ins><span class="cx"> void UniqueIDBDatabase::registerConnection(DatabaseProcessIDBConnection& connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_connections.contains(&connection));
</span><span class="lines">@@ -59,70 +100,171 @@
</span><span class="cx"> ASSERT(m_connections.contains(&connection));
</span><span class="cx"> m_connections.remove(&connection);
</span><span class="cx">
</span><del>- if (m_connections.isEmpty())
</del><ins>+ if (m_connections.isEmpty()) {
+ shutdown();
</ins><span class="cx"> DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::enqueueDatabaseQueueRequest(PassRefPtr<AsyncRequest> request)
</del><ins>+void UniqueIDBDatabase::shutdown()
</ins><span class="cx"> {
</span><del>- ASSERT(request);
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- MutexLocker locker(m_databaseQueueRequestsMutex);
- m_databaseQueueRequests.append(request);
</del><ins>+ m_acceptingNewRequests = false;
</ins><span class="cx">
</span><del>- if (m_processingDatabaseQueueRequests)
</del><ins>+ {
+ MutexLocker locker(m_databaseTaskMutex);
+ m_databaseTasks.clear();
+ }
+
+ {
+ MutexLocker locker(m_mainThreadTaskMutex);
+ m_mainThreadTasks.clear();
+ }
+
+ while (!m_pendingMetadataRequests.isEmpty()) {
+ auto request = m_pendingMetadataRequests.takeFirst();
+ request->requestAborted();
+ }
+}
+
+void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const IDBDatabaseMetadata&)> completionCallback)
+{
+ ASSERT(isMainThread());
+
+ if (!m_acceptingNewRequests) {
+ completionCallback(false, IDBDatabaseMetadata());
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- m_processingDatabaseQueueRequests = true;
- DatabaseProcess::shared().queue().dispatch(bind(&UniqueIDBDatabase::processDatabaseRequestQueue, this));
</del><ins>+ // If we've already retrieved metadata from the backing store, return it now.
+ if (m_didGetMetadataFromBackingStore) {
+ if (m_metadata)
+ completionCallback(true, *m_metadata);
+ else
+ completionCallback(false, IDBDatabaseMetadata());
+
+ return;
+ }
+
+ // If this is the first unanswered metadata request, post a task to open the backing store and get metadata.
+ if (m_pendingMetadataRequests.isEmpty())
+ postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::openBackingStoreAndReadMetadata, m_identifier, absoluteDatabaseDirectory()));
+
+ // Then remember this metadata request to be answered later.
+ RefPtr<AsyncRequest> request = AsyncRequestImpl<>::create([completionCallback, this]() {
+ completionCallback(!!m_metadata, m_metadata ? *m_metadata : IDBDatabaseMetadata());
+ }, [completionCallback]() {
+ // The boolean flag to the completion callback represents whether the
+ // attempt to get/establish metadata succeeded or failed.
+ // Since we're aborting the attempt, it failed, so we always pass in false.
+ completionCallback(false, IDBDatabaseMetadata());
+ });
+
+ m_pendingMetadataRequests.append(request.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::processDatabaseRequestQueue()
</del><ins>+void UniqueIDBDatabase::openBackingStoreAndReadMetadata(const UniqueIDBDatabaseIdentifier& identifier, const String& databaseDirectory)
</ins><span class="cx"> {
</span><del>- ASSERT(m_processingDatabaseQueueRequests);
</del><ins>+ ASSERT(!isMainThread());
+ ASSERT(!m_backingStore);
</ins><span class="cx">
</span><del>- while (true) {
- RefPtr<AsyncRequest> request;
- {
- MutexLocker locker(m_databaseQueueRequestsMutex);
- if (m_databaseQueueRequests.isEmpty()) {
- m_processingDatabaseQueueRequests = false;
- return;
- }
- request = m_databaseQueueRequests.takeFirst();
- }
</del><ins>+ if (m_inMemory) {
+ LOG_ERROR("Support for in-memory databases not yet implemented");
+ return;
+ }
</ins><span class="cx">
</span><ins>+ m_backingStore = UniqueIDBDatabaseBackingStoreSQLite::create(identifier, databaseDirectory);
+ std::unique_ptr<IDBDatabaseMetadata> metadata = m_backingStore->getOrEstablishMetadata();
+
+ postMainThreadTask(createAsyncTask(*this, &UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata, metadata ? *metadata : IDBDatabaseMetadata(), !!metadata));
+}
+
+void UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata(const IDBDatabaseMetadata& metadata, bool success)
+{
+ ASSERT(isMainThread());
+ ASSERT(!m_metadata);
+
+ m_didGetMetadataFromBackingStore = true;
+
+ if (success)
+ m_metadata = std::make_unique<IDBDatabaseMetadata>(metadata);
+
+ while (!m_pendingMetadataRequests.isEmpty()) {
+ RefPtr<AsyncRequest> request = m_pendingMetadataRequests.takeFirst();
</ins><span class="cx"> request->completeRequest();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const IDBDatabaseMetadata&)> completionCallback)
</del><ins>+String UniqueIDBDatabase::absoluteDatabaseDirectory() const
</ins><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = AsyncRequestImpl<>::create([completionCallback, this]() {
- IDBDatabaseMetadata metadata;
- bool success = getOrEstablishIDBDatabaseMetadataInternal(metadata);
</del><ins>+ ASSERT(isMainThread());
+ return DatabaseProcess::shared().absoluteIndexedDatabasePathFromDatabaseRelativePath(m_databaseRelativeDirectory);
+}
</ins><span class="cx">
</span><del>- RunLoop::main()->dispatch([metadata, success, completionCallback]() {
- completionCallback(success, metadata);
- });
- }, [completionCallback]() {
- RunLoop::main()->dispatch([completionCallback]() {
- // The boolean flag to the completion callback represents whether the attempt to get/establish metadata
- // succeeded or failed.
- // Since we're aborting the attempt, it failed, so we always pass in false.
- completionCallback(false, IDBDatabaseMetadata());
- });
- });
</del><ins>+void UniqueIDBDatabase::postMainThreadTask(std::unique_ptr<AsyncTask> task)
+{
+ ASSERT(!isMainThread());
</ins><span class="cx">
</span><del>- enqueueDatabaseQueueRequest(request.release());
</del><ins>+ if (!m_acceptingNewRequests)
+ return;
+
+ MutexLocker locker(m_mainThreadTaskMutex);
+
+ m_mainThreadTasks.append(std::move(task));
+
+ RunLoop::main()->dispatch(bind(&UniqueIDBDatabase::performNextMainThreadTask, this));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadataInternal(const WebCore::IDBDatabaseMetadata&)
</del><ins>+void UniqueIDBDatabase::performNextMainThreadTask()
</ins><span class="cx"> {
</span><del>- // FIXME: This method is successfully called by messaging from the WebProcess, and calls back with dummy data.
- // Needs real implementation.
</del><ins>+ ASSERT(isMainThread());
+
+ std::unique_ptr<AsyncTask> task;
+ {
+ MutexLocker locker(m_mainThreadTaskMutex);
+ ASSERT(!m_mainThreadTasks.isEmpty());
+ task = m_mainThreadTasks.takeFirst();
+ }
+
+ task->performTask();
+}
+
+void UniqueIDBDatabase::postDatabaseTask(std::unique_ptr<AsyncTask> task)
+{
+ ASSERT(isMainThread());
+
+ if (!m_acceptingNewRequests)
+ return;
+
+ MutexLocker locker(m_databaseTaskMutex);
+
+ m_databaseTasks.append(std::move(task));
+
+ DatabaseProcess::shared().queue().dispatch(bind(&UniqueIDBDatabase::performNextDatabaseTask, this));
+}
+
+void UniqueIDBDatabase::performNextDatabaseTask()
+{
</ins><span class="cx"> ASSERT(!isMainThread());
</span><del>- return false;
</del><ins>+
+ // It is possible that this database might be shutting down on the main thread.
+ // In this case, immediately after releasing m_databaseTaskMutex, this database might get deleted.
+ // We take a ref() to make sure the database is still live while this last task is performed.
+ RefPtr<UniqueIDBDatabase> protector(this);
+
+ std::unique_ptr<AsyncTask> task;
+ {
+ MutexLocker locker(m_databaseTaskMutex);
+
+ // This database might be shutting down on the main thread, in which case the task queue might be empty.
+ if (m_databaseTasks.isEmpty())
+ return;
+
+ task = m_databaseTasks.takeFirst();
+ }
+
+ task->performTask();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -43,11 +43,13 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class AsyncRequest;
</span><ins>+class AsyncTask;
</ins><span class="cx"> class DatabaseProcessIDBConnection;
</span><ins>+class UniqueIDBDatabaseBackingStore;
</ins><span class="cx">
</span><span class="cx"> struct SecurityOriginData;
</span><span class="cx">
</span><del>-class UniqueIDBDatabase : public RefCounted<UniqueIDBDatabase> {
</del><ins>+class UniqueIDBDatabase : public ThreadSafeRefCounted<UniqueIDBDatabase> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<UniqueIDBDatabase> create(const UniqueIDBDatabaseIdentifier& identifier)
</span><span class="cx"> {
</span><span class="lines">@@ -68,18 +70,48 @@
</span><span class="cx">
</span><span class="cx"> UniqueIDBDatabaseIdentifier m_identifier;
</span><span class="cx">
</span><ins>+ bool m_inMemory;
+ String m_databaseRelativeDirectory;
+
</ins><span class="cx"> HashSet<RefPtr<DatabaseProcessIDBConnection>> m_connections;
</span><span class="cx"> HashMap<uint64_t, RefPtr<AsyncRequest>> m_databaseRequests;
</span><span class="cx">
</span><del>- void enqueueDatabaseQueueRequest(PassRefPtr<AsyncRequest>);
</del><ins>+ String absoluteDatabaseDirectory() const;
</ins><span class="cx">
</span><ins>+ void postDatabaseTask(std::unique_ptr<AsyncTask>);
+ void shutdown();
+
+ // Method that attempts to make legal filenames from all legal database names
+ String filenameForDatabaseName() const;
+
+ // Returns a string that is appropriate for use as a unique filename
+ String databaseFilenameIdentifier(const SecurityOriginData&) const;
+
+ // Returns true if this origin can use the same databases as the given origin.
+ bool canShareDatabases(const SecurityOriginData&, const SecurityOriginData&) const;
+
</ins><span class="cx"> // To be called from the database workqueue thread only
</span><del>- void processDatabaseRequestQueue();
- bool getOrEstablishIDBDatabaseMetadataInternal(const WebCore::IDBDatabaseMetadata&);
</del><ins>+ void performNextDatabaseTask();
+ void postMainThreadTask(std::unique_ptr<AsyncTask>);
+ void openBackingStoreAndReadMetadata(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
</ins><span class="cx">
</span><del>- Mutex m_databaseQueueRequestsMutex;
- Deque<RefPtr<AsyncRequest>> m_databaseQueueRequests;
- bool m_processingDatabaseQueueRequests;
</del><ins>+ // Callbacks from the database workqueue thread, to be performed on the main thread only
+ void performNextMainThreadTask();
+ void didOpenBackingStoreAndReadMetadata(const WebCore::IDBDatabaseMetadata&, bool success);
+
+ Deque<RefPtr<AsyncRequest>> m_pendingMetadataRequests;
+ bool m_acceptingNewRequests;
+
+ std::unique_ptr<WebCore::IDBDatabaseMetadata> m_metadata;
+ bool m_didGetMetadataFromBackingStore;
+
+ RefPtr<UniqueIDBDatabaseBackingStore> m_backingStore;
+
+ Deque<std::unique_ptr<AsyncTask>> m_databaseTasks;
+ Mutex m_databaseTaskMutex;
+
+ Deque<std::unique_ptr<AsyncTask>> m_mainThreadTasks;
+ Mutex m_mainThreadTaskMutex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseBackingStorehfromrev160515trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h (from rev 160515, trunk/Source/WebKit2/Shared/SecurityOriginData.h) (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseBackingStore.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef UniqueIDBDatabaseBackingStore_h
+#define UniqueIDBDatabaseBackingStore_h
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+struct IDBDatabaseMetadata;
+}
+
+namespace WebKit {
+
+class UniqueIDBDatabaseBackingStore : public RefCounted<UniqueIDBDatabaseBackingStore> {
+public:
+ virtual ~UniqueIDBDatabaseBackingStore() { }
+
+ virtual std::unique_ptr<WebCore::IDBDatabaseMetadata> getOrEstablishMetadata() = 0;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // UniqueIDBDatabaseBackingStore_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -75,6 +75,17 @@
</span><span class="cx"> return m_databaseName.isNull();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+UniqueIDBDatabaseIdentifier UniqueIDBDatabaseIdentifier::isolatedCopy() const
+{
+ UniqueIDBDatabaseIdentifier result;
+
+ result.m_databaseName = m_databaseName.isolatedCopy();
+ result.m_openingOrigin = m_openingOrigin.isolatedCopy();
+ result.m_mainFrameOrigin = m_mainFrameOrigin.isolatedCopy();
+
+ return result;
+}
+
</ins><span class="cx"> bool operator==(const UniqueIDBDatabaseIdentifier& a, const UniqueIDBDatabaseIdentifier& b)
</span><span class="cx"> {
</span><span class="cx"> if (&a == &b)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> bool isHashTableDeletedValue() const;
</span><span class="cx"> unsigned hash() const;
</span><span class="cx">
</span><ins>+ UniqueIDBDatabaseIdentifier isolatedCopy() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> String m_databaseName;
</span><span class="cx"> SecurityOriginData m_openingOrigin;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,181 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "UniqueIDBDatabaseBackingStoreSQLite.h"
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include <WebCore/FileSystem.h>
+#include <WebCore/IDBDatabaseMetadata.h>
+#include <WebCore/SQLiteDatabase.h>
+#include <WebCore/SQLiteStatement.h>
+#include <wtf/MainThread.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+// Current version of the metadata schema being used in the metadata database.
+static const int currentMetadataVersion = 1;
+
+UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier& identifier, const String& databaseDirectory)
+ : m_identifier(identifier)
+ , m_absoluteDatabaseDirectory(databaseDirectory)
+{
+ // The backing store is meant to be created and used entirely on a background thread.
+ ASSERT(!isMainThread());
+}
+
+std::unique_ptr<WebCore::IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata()
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_metadataDB);
+ ASSERT(m_metadataDB->isOpen());
+
+ if (!m_metadataDB->executeCommand("CREATE TABLE IDBDatabaseInfo (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value TEXT NOT NULL ON CONFLICT FAIL);")) {
+ LOG_ERROR("Could not create IDBDatabaseInfo table in database (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
+ m_metadataDB = nullptr;
+ return nullptr;
+ }
+
+ {
+ SQLiteStatement sql(*m_metadataDB, "INSERT INTO IDBDatabaseInfo VALUES ('MetadataVersion', ?);");
+ if (sql.prepare() != SQLResultOk
+ || sql.bindInt(1, currentMetadataVersion) != SQLResultOk
+ || sql.step() != SQLResultDone) {
+ LOG_ERROR("Could not insert database metadata version into IDBDatabaseInfo table (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
+ m_metadataDB = nullptr;
+ return nullptr;
+ }
+ }
+ {
+ SQLiteStatement sql(*m_metadataDB, "INSERT INTO IDBDatabaseInfo VALUES ('DatabaseName', ?);");
+ if (sql.prepare() != SQLResultOk
+ || sql.bindText(1, m_identifier.databaseName()) != SQLResultOk
+ || sql.step() != SQLResultDone) {
+ LOG_ERROR("Could not insert database name into IDBDatabaseInfo table (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
+ m_metadataDB = nullptr;
+ return nullptr;
+ }
+ }
+ {
+ // Database versions are defined to be a uin64_t in the spec but sqlite3 doesn't support native binding of unsigned integers.
+ // Therefore we'll store the version as a String.
+ SQLiteStatement sql(*m_metadataDB, "INSERT INTO IDBDatabaseInfo VALUES ('DatabaseVersion', ?);");
+ if (sql.prepare() != SQLResultOk
+ || sql.bindText(1, String::number(0)) != SQLResultOk
+ || sql.step() != SQLResultDone) {
+ LOG_ERROR("Could not insert default version into IDBDatabaseInfo table (%i) - %s", m_metadataDB->lastError(), m_metadataDB->lastErrorMsg());
+ m_metadataDB = nullptr;
+ return nullptr;
+ }
+ }
+
+ // This initial metadata matches the default values we just put into the metadata database.
+ auto metadata = std::make_unique<IDBDatabaseMetadata>();
+ metadata->name = m_identifier.databaseName();
+ metadata->version = 0;
+
+ return metadata;
+}
+
+std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata()
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_metadataDB);
+
+ if (!m_metadataDB->tableExists("IDBDatabaseInfo"))
+ return nullptr;
+
+ auto metadata = std::make_unique<IDBDatabaseMetadata>();
+ {
+ SQLiteStatement sql(*m_metadataDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'MetadataVersion';");
+ if (sql.isColumnNull(0))
+ return nullptr;
+ metadata->version = sql.getColumnInt(0);
+ }
+ {
+ SQLiteStatement sql(*m_metadataDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'DatabaseName';");
+ if (sql.isColumnNull(0))
+ return nullptr;
+ metadata->name = sql.getColumnText(0);
+ if (metadata->name != m_identifier.databaseName()) {
+ LOG_ERROR("Database name in the metadata database ('%s') does not match the expected name ('%s')", metadata->name.utf8().data(), m_identifier.databaseName().utf8().data());
+ return nullptr;
+ }
+ }
+ {
+ SQLiteStatement sql(*m_metadataDB, "SELECT value FROM IDBDatabaseInfo WHERE key = 'DatabaseVersion';");
+ if (sql.isColumnNull(0))
+ return nullptr;
+ String stringVersion = sql.getColumnText(0);
+ bool ok;
+ metadata->version = stringVersion.toUInt64Strict(&ok);
+ if (!ok) {
+ LOG_ERROR("Database version on disk ('%s') does not cleanly convert to an unsigned 64-bit integer version", stringVersion.utf8().data());
+ return nullptr;
+ }
+ }
+
+ // FIXME: Once we save ObjectStores and indexes we need to extract their metadata, also.
+ return metadata;
+}
+
+std::unique_ptr<SQLiteDatabase> UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath(const String& path)
+{
+ ASSERT(!isMainThread());
+
+ auto sqliteDatabase = std::make_unique<SQLiteDatabase>();
+ if (!sqliteDatabase->open(path)) {
+ LOG_ERROR("Failed to open SQLite database at path '%s'", path.utf8().data());
+ return nullptr;
+ }
+
+ return sqliteDatabase;
+}
+
+std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata()
+{
+ ASSERT(!isMainThread());
+
+ String metadataDBFilename = pathByAppendingComponent(m_absoluteDatabaseDirectory, "IDBMetadata.sqlite3");
+ m_metadataDB = openSQLiteDatabaseAtPath(metadataDBFilename);
+ if (!m_metadataDB)
+ return nullptr;
+
+ std::unique_ptr<IDBDatabaseMetadata> metadata = extractExistingMetadata();
+ if (!metadata)
+ metadata = createAndPopulateInitialMetadata();
+
+ if (!metadata)
+ LOG_ERROR("Unable to establish IDB database at path '%s'", metadataDBFilename.utf8().data());
+
+ return metadata;
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitehfromrev160515trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h (from rev 160515, trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h) (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h (rev 0)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef UniqueIDBDatabaseBackingStoreSQLite_h
+#define UniqueIDBDatabaseBackingStoreSQLite_h
+
+#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+
+#include "UniqueIDBDatabase.h"
+#include "UniqueIDBDatabaseBackingStore.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+class SQLiteDatabase;
+struct IDBDatabaseMetadata;
+}
+
+namespace WebKit {
+
+class UniqueIDBDatabaseBackingStoreSQLite FINAL : public UniqueIDBDatabaseBackingStore {
+public:
+ static PassRefPtr<UniqueIDBDatabaseBackingStore> create(const UniqueIDBDatabaseIdentifier& identifier, const String& databaseDirectory)
+ {
+ return adoptRef(new UniqueIDBDatabaseBackingStoreSQLite(identifier, databaseDirectory));
+ }
+
+ virtual std::unique_ptr<WebCore::IDBDatabaseMetadata> getOrEstablishMetadata() OVERRIDE;
+
+private:
+ UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
+
+ std::unique_ptr<WebCore::SQLiteDatabase> openSQLiteDatabaseAtPath(const String&);
+ std::unique_ptr<WebCore::IDBDatabaseMetadata> extractExistingMetadata();
+ std::unique_ptr<WebCore::IDBDatabaseMetadata> createAndPopulateInitialMetadata();
+
+ UniqueIDBDatabaseIdentifier m_identifier;
+ String m_absoluteDatabaseDirectory;
+
+ std::unique_ptr<WebCore::SQLiteDatabase> m_metadataDB;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
+#endif // UniqueIDBDatabaseBackingStoreSQLite_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncTaskh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/AsyncTask.h (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncTask.h (rev 0)
+++ trunk/Source/WebKit2/Shared/AsyncTask.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AsyncTask_h
+#define AsyncTask_h
+
+#include <WebCore/CrossThreadCopier.h>
+#include <functional>
+
+namespace WebKit {
+
+class AsyncTask {
+ WTF_MAKE_NONCOPYABLE(AsyncTask);
+public:
+ virtual ~AsyncTask() { }
+
+ virtual void performTask() = 0;
+
+protected:
+ explicit AsyncTask() { }
+};
+
+template <typename T, typename... Arguments>
+class AsyncTaskImpl FINAL : public AsyncTask {
+public:
+ AsyncTaskImpl(T* callee, void (T::*method)(Arguments...), Arguments&&... arguments)
+ {
+ m_taskFunction = [callee, method, arguments...]() {
+ (callee->*method)(arguments...);
+ };
+ }
+
+ virtual ~AsyncTaskImpl()
+ {
+ }
+
+private:
+ virtual void performTask() OVERRIDE
+ {
+ m_taskFunction();
+ }
+
+ std::function<void()> m_taskFunction;
+};
+
+template<typename T>
+std::unique_ptr<AsyncTask> createAsyncTask(
+ T& callee,
+ void (T::*method)())
+{
+ return std::make_unique<AsyncTaskImpl<T>>(&callee, method);
+}
+
+template<typename T, typename P1, typename MP1>
+std::unique_ptr<AsyncTask> createAsyncTask(
+ T& callee,
+ void (T::*method)(MP1),
+ const P1& parameter1)
+{
+ return std::make_unique<AsyncTaskImpl<T, MP1>>(
+ &callee,
+ method,
+ WebCore::CrossThreadCopier<P1>::copy(parameter1));
+}
+
+template<typename T, typename P1, typename MP1, typename P2, typename MP2>
+std::unique_ptr<AsyncTask> createAsyncTask(
+ T& callee,
+ void (T::*method)(MP1, MP2),
+ const P1& parameter1,
+ const P2& parameter2)
+{
+ return std::make_unique<AsyncTaskImpl<T, MP1, MP2>>(
+ &callee,
+ method,
+ WebCore::CrossThreadCopier<P1>::copy(parameter1),
+ WebCore::CrossThreadCopier<P2>::copy(parameter2));
+
+}
+
+} // namespace WebKit
+
+#endif // AsyncTask_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><ins>+#include <wtf/text/CString.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -69,6 +70,17 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SecurityOriginData SecurityOriginData::isolatedCopy() const
+{
+ SecurityOriginData result;
+
+ result.protocol = protocol.isolatedCopy();
+ result.host = host.isolatedCopy();
+ result.port = port;
+
+ return result;
+}
+
</ins><span class="cx"> void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>& originDatas, ArrayCallback* callback)
</span><span class="cx"> {
</span><span class="cx"> if (!callback) {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.h (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.h 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> String protocol;
</span><span class="cx"> String host;
</span><span class="cx"> int port;
</span><ins>+
+ SecurityOriginData isolatedCopy() const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>&, ArrayCallback*);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopiercppfromrev160515trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp (from rev 160515, trunk/Source/WebKit2/Shared/SecurityOriginData.h) (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "config.h"
+#include "WebCrossThreadCopier.h"
+
+#if ENABLE(INDEXED_DATABASE)
+
+#include "UniqueIDBDatabaseIdentifier.h"
+
+using namespace WebKit;
+
+namespace WebCore {
+
+UniqueIDBDatabaseIdentifier CrossThreadCopierBase<false, false, UniqueIDBDatabaseIdentifier>::copy(const UniqueIDBDatabaseIdentifier& identifier)
+{
+ return identifier.isolatedCopy();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCrossThreadCopierhfromrev160515trunkSourceWebKit2SharedSecurityOriginDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h (from rev 160515, trunk/Source/WebKit2/Shared/SecurityOriginData.h) (0 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebCrossThreadCopier.h 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCrossThreadCopier_h
+#define WebCrossThreadCopier_h
+
+#include <WebCore/CrossThreadCopier.h>
+
+#if ENABLE(INDEXED_DATABASE)
+
+namespace WebKit {
+class UniqueIDBDatabaseIdentifier;
+}
+
+namespace WebCore {
+
+template<> struct CrossThreadCopierBase<false, false, WebKit::UniqueIDBDatabaseIdentifier> {
+ static WebKit::UniqueIDBDatabaseIdentifier copy(const WebKit::UniqueIDBDatabaseIdentifier&);
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(INDEXED_DATABASE)
+#endif // WebCrossThreadCopier_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160516 => 160517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-13 00:30:30 UTC (rev 160516)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-13 00:42:14 UTC (rev 160517)
</span><span class="lines">@@ -576,9 +576,13 @@
</span><span class="cx"> 515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */; };
</span><span class="cx"> 515E773418402D510007203F /* UniqueIDBDatabaseIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */; };
</span><span class="cx"> 5160BFE113381DF900918999 /* Logging.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* Logging.mac.mm */; };
</span><ins>+ 516311871858446600534647 /* WebCrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 516311861858446600534647 /* WebCrossThreadCopier.h */; };
</ins><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
</span><span class="cx"> 5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
</span><span class="cx"> 5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
</span><ins>+ 51654EFD184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */; };
+ 51654EFE184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */; };
+ 51654F00184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */; };
</ins><span class="cx"> 5167EEA0170377BF007681CA /* DiskCacheMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5167EE9E170377BF007681CA /* DiskCacheMonitor.h */; };
</span><span class="cx"> 5167EEA1170377BF007681CA /* DiskCacheMonitor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5167EE9F170377BF007681CA /* DiskCacheMonitor.mm */; };
</span><span class="cx"> 516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* WebError.h */; };
</span><span class="lines">@@ -638,6 +642,8 @@
</span><span class="cx"> 51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */; };
</span><span class="cx"> 51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51B3004E12529D0E000B5CA0 /* WebBackForwardListCF.cpp */; };
</span><span class="cx"> 51B3005112529D0E000B5CA0 /* WebPageProxyCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */; };
</span><ins>+ 51BA24441858EE3000EA2811 /* AsyncTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BA24431858EE3000EA2811 /* AsyncTask.h */; };
+ 51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */; };
</ins><span class="cx"> 51C96118183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C96116183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp */; };
</span><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */; };
</span><span class="cx"> 51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */; };
</span><span class="lines">@@ -2139,7 +2145,11 @@
</span><span class="cx"> 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseIdentifier.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseIdentifier.h; sourceTree = "<group>"; };
</span><span class="cx"> 5160BFE013381DF900918999 /* Logging.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Logging.mac.mm; sourceTree = "<group>"; };
</span><ins>+ 516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
</ins><span class="cx"> 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
</span><ins>+ 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseBackingStoreSQLite.cpp; sourceTree = "<group>"; };
+ 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStoreSQLite.h; sourceTree = "<group>"; };
+ 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseBackingStore.h; sourceTree = "<group>"; };
</ins><span class="cx"> 5167EE9E170377BF007681CA /* DiskCacheMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskCacheMonitor.h; sourceTree = "<group>"; };
</span><span class="cx"> 5167EE9F170377BF007681CA /* DiskCacheMonitor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DiskCacheMonitor.mm; sourceTree = "<group>"; };
</span><span class="cx"> 516A4A5B120A2CCD00C05B7F /* WebError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebError.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2205,6 +2215,8 @@
</span><span class="cx"> 51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EnvironmentUtilities.h; path = unix/EnvironmentUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> 51B3004E12529D0E000B5CA0 /* WebBackForwardListCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebBackForwardListCF.cpp; path = cf/WebBackForwardListCF.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51B3004F12529D0E000B5CA0 /* WebPageProxyCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPageProxyCF.cpp; path = cf/WebPageProxyCF.cpp; sourceTree = "<group>"; };
</span><ins>+ 51BA24431858EE3000EA2811 /* AsyncTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncTask.h; sourceTree = "<group>"; };
+ 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebCrossThreadCopier.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 51C96115183C95FF00D2002E /* WebIDBServerConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebIDBServerConnection.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 51C96116183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBServerConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBServerConnectionMessages.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3434,6 +3446,7 @@
</span><span class="cx"> A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
</span><span class="cx"> 515E7725183DD6F60007203F /* AsyncRequest.cpp */,
</span><span class="cx"> 515E7726183DD6F60007203F /* AsyncRequest.h */,
</span><ins>+ 51BA24431858EE3000EA2811 /* AsyncTask.h */,
</ins><span class="cx"> 4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */,
</span><span class="cx"> BCF18637167D071E00A1A85A /* CacheModel.cpp */,
</span><span class="cx"> BC3065F91259344E00E71278 /* CacheModel.h */,
</span><span class="lines">@@ -3513,6 +3526,8 @@
</span><span class="cx"> 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */,
</span><span class="cx"> 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */,
</span><span class="cx"> BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
</span><ins>+ 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */,
+ 516311861858446600534647 /* WebCrossThreadCopier.h */,
</ins><span class="cx"> 51578B821209ECEF00A37C4A /* WebData.h */,
</span><span class="cx"> BC575612126E0138006F0F12 /* WebError.cpp */,
</span><span class="cx"> 516A4A5B120A2CCD00C05B7F /* WebError.h */,
</span><span class="lines">@@ -4035,6 +4050,15 @@
</span><span class="cx"> name = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 51654EF0184EF241007DC837 /* sqlite */ = {
+ isa = PBXGroup;
+ children = (
+ 51654EFB184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp */,
+ 51654EFC184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h */,
+ );
+ path = sqlite;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 517DD5BB180DA7C40081660B /* Databases */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -4159,11 +4183,13 @@
</span><span class="cx"> 51E351F9180F5CF600E53BE9 /* IndexedDB */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 51654EF0184EF241007DC837 /* sqlite */,
</ins><span class="cx"> 51D0D42E183B34130097041D /* DatabaseProcessIDBConnection.cpp */,
</span><span class="cx"> 51D0D42F183B34130097041D /* DatabaseProcessIDBConnection.h */,
</span><span class="cx"> 51D0D430183B34130097041D /* DatabaseProcessIDBConnection.messages.in */,
</span><span class="cx"> 515E772D184015800007203F /* UniqueIDBDatabase.cpp */,
</span><span class="cx"> 515E772E184015800007203F /* UniqueIDBDatabase.h */,
</span><ins>+ 51654EFF184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h */,
</ins><span class="cx"> 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */,
</span><span class="cx"> 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -5616,6 +5642,7 @@
</span><span class="cx"> BC032DA910F437D10058C15A /* Arguments.h in Headers */,
</span><span class="cx"> BCEE966D112FAF57006BCC24 /* Attachment.h in Headers */,
</span><span class="cx"> E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */,
</span><ins>+ 51BA24441858EE3000EA2811 /* AsyncTask.h in Headers */,
</ins><span class="cx"> 512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */,
</span><span class="cx"> 1A445B9F184D5FB5004B3414 /* WKContextInjectedBundleClient.h in Headers */,
</span><span class="cx"> 512F589912A8838800629530 /* AuthenticationDecisionListener.h in Headers */,
</span><span class="lines">@@ -5703,6 +5730,7 @@
</span><span class="cx"> BC8147A912F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h in Headers */,
</span><span class="cx"> BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */,
</span><span class="cx"> 1A9E32891821636900F5D04C /* WKRemoteObjectRegistry.h in Headers */,
</span><ins>+ 51654EFE184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.h in Headers */,
</ins><span class="cx"> BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
</span><span class="cx"> BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
</span><span class="cx"> BCB0B0DE12305A8C00B1341E /* InjectedBundleUserMessageCoders.h in Headers */,
</span><span class="lines">@@ -5753,6 +5781,7 @@
</span><span class="cx"> 1AB474E0184D446A0051B622 /* WKBundlePageEditorClient.h in Headers */,
</span><span class="cx"> 1A2D848B127F6A49001EB962 /* NPIdentifierData.h in Headers */,
</span><span class="cx"> 1AE4976811FF658E0048B464 /* NPJSObject.h in Headers */,
</span><ins>+ 516311871858446600534647 /* WebCrossThreadCopier.h in Headers */,
</ins><span class="cx"> 1AB474E2184D44800051B622 /* WKBundlePageFormClient.h in Headers */,
</span><span class="cx"> 1A2D82A5127F4EAB001EB962 /* NPObjectMessageReceiver.h in Headers */,
</span><span class="cx"> 1A2D843A127F65D5001EB962 /* NPObjectMessageReceiverMessages.h in Headers */,
</span><span class="lines">@@ -5912,6 +5941,7 @@
</span><span class="cx"> BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */,
</span><span class="cx"> F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */,
</span><span class="cx"> 1AB7D72C1288CAAD00CFD08C /* WebDownloadClient.h in Headers */,
</span><ins>+ 51654F00184EF34A007DC837 /* UniqueIDBDatabaseBackingStore.h in Headers */,
</ins><span class="cx"> BC032D7B10F4378D0058C15A /* WebDragClient.h in Headers */,
</span><span class="cx"> BCA0EF9F12332642007D3CFB /* WebEditCommandProxy.h in Headers */,
</span><span class="cx"> BC032D7D10F4378D0058C15A /* WebEditorClient.h in Headers */,
</span><span class="lines">@@ -7189,6 +7219,7 @@
</span><span class="cx"> 1A44B95716B737AA00B7BBD8 /* StorageNamespaceImpl.cpp in Sources */,
</span><span class="cx"> 1AFF49001833DE78009AB15A /* WKDeprecatedFunctions.cpp in Sources */,
</span><span class="cx"> 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */,
</span><ins>+ 51654EFD184EF33F007DC837 /* UniqueIDBDatabaseBackingStoreSQLite.cpp in Sources */,
</ins><span class="cx"> 296BD85E15019BC30071F424 /* StringUtilities.mm in Sources */,
</span><span class="cx"> 1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */,
</span><span class="cx"> 51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */,
</span><span class="lines">@@ -7497,6 +7528,7 @@
</span><span class="cx"> 1AC7537B183A9FDB0072CB15 /* PageLoadState.cpp in Sources */,
</span><span class="cx"> BC407607124FF0270068F20A /* WKType.cpp in Sources */,
</span><span class="cx"> 7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */,
</span><ins>+ 51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */,
</ins><span class="cx"> BC407609124FF0270068F20A /* WKURL.cpp in Sources */,
</span><span class="cx"> BC40761B124FF0370068F20A /* WKURLCF.mm in Sources */,
</span><span class="cx"> BC40760B124FF0270068F20A /* WKURLRequest.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>