<!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>[189244] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189244">189244</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-02 04:58:36 -0700 (Wed, 02 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix build with ENABLE(DATABASE_PROCESS) and !ENABLE(INDEXED_DATABASE)
https://bugs.webkit.org/show_bug.cgi?id=146550
Patch by Emanuele Aina <emanuele.aina@collabora.com> on 2015-09-02
Reviewed by Brady Eidson.
Given that INDEXED_DATABASE at the moment is the only user of
DATABASE_PROCESS, their guards got inevitably mixed up with various
levels of consistency. Since the --no-indexed-database flag from
build-webkit leaves DATABASE_PROCESS enabled, this resulted in build
failures.
* DatabaseProcess/DatabaseProcess.cpp:
* DatabaseProcess/DatabaseToWebProcessConnection.cpp:
* Shared/Databases/DatabaseProcessCreationParameters.cpp:
* Shared/Databases/DatabaseProcessCreationParameters.h:
* UIProcess/WebProcessPool.cpp:
* WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
* WebProcess/Databases/WebToDatabaseProcessConnection.h:
Add missing ENABLE(INDEXED_DATABASE) guards and moved the
misplaced ones.
* DatabaseProcess/DatabaseProcess.h:
Ditto, and also add a forward declaration for SecurityOriginData since
with INDEXED_DATABASE off SecurityOriginData.h is no longer included
by way of UniqueIDBDatabaseIdentifier.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedDatabasesDatabaseProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedDatabasesDatabaseProcessCreationParametersh">trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesWebToDatabaseProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesWebToDatabaseProcessConnectionh">trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-09-02 Emanuele Aina <emanuele.aina@collabora.com>
+
+ Fix build with ENABLE(DATABASE_PROCESS) and !ENABLE(INDEXED_DATABASE)
+ https://bugs.webkit.org/show_bug.cgi?id=146550
+
+ Reviewed by Brady Eidson.
+
+ Given that INDEXED_DATABASE at the moment is the only user of
+ DATABASE_PROCESS, their guards got inevitably mixed up with various
+ levels of consistency. Since the --no-indexed-database flag from
+ build-webkit leaves DATABASE_PROCESS enabled, this resulted in build
+ failures.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ * Shared/Databases/DatabaseProcessCreationParameters.cpp:
+ * Shared/Databases/DatabaseProcessCreationParameters.h:
+ * UIProcess/WebProcessPool.cpp:
+ * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+ * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+ Add missing ENABLE(INDEXED_DATABASE) guards and moved the
+ misplaced ones.
+
+ * DatabaseProcess/DatabaseProcess.h:
+ Ditto, and also add a forward declaration for SecurityOriginData since
+ with INDEXED_DATABASE off SecurityOriginData.h is no longer included
+ by way of UniqueIDBDatabaseIdentifier.h.
+
</ins><span class="cx"> 2015-09-01 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: opt the Inspector process out of page visibility-based process suppression when running tests
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> RunLoop::current().stop();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> RefPtr<UniqueIDBDatabase> DatabaseProcess::getOrCreateUniqueIDBDatabase(const UniqueIDBDatabaseIdentifier& identifier)
</span><span class="cx"> {
</span><span class="cx"> auto addResult = m_idbDatabases.add(identifier, nullptr);
</span><span class="lines">@@ -114,9 +115,11 @@
</span><span class="cx">
</span><span class="cx"> m_idbDatabases.remove(identifier);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void DatabaseProcess::initializeDatabaseProcess(const DatabaseProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> // *********
</span><span class="cx"> // IMPORTANT: Do not change the directory structure for indexed databases on disk without first consulting a reviewer from Apple (<rdar://problem/17454712>)
</span><span class="cx"> // *********
</span><span class="lines">@@ -125,12 +128,15 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.indexedDatabaseDirectoryExtensionHandle);
</span><span class="cx">
</span><span class="cx"> ensureIndexedDatabaseRelativePathExists(StringImpl::empty());
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> void DatabaseProcess::ensureIndexedDatabaseRelativePathExists(const String& relativePath)
</span><span class="cx"> {
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &DatabaseProcess::ensurePathExists, absoluteIndexedDatabasePathFromDatabaseRelativePath(relativePath)));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void DatabaseProcess::ensurePathExists(const String& path)
</span><span class="cx"> {
</span><span class="lines">@@ -140,12 +146,14 @@
</span><span class="cx"> LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> String DatabaseProcess::absoluteIndexedDatabasePathFromDatabaseRelativePath(const String& relativePath)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: pathByAppendingComponent() was originally designed to append individual atomic components.
</span><span class="cx"> // We don't have a function designed to append a multi-component subpath, but we should.
</span><span class="cx"> return pathByAppendingComponent(m_indexedDatabaseDirectory, relativePath);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void DatabaseProcess::postDatabaseTask(std::unique_ptr<AsyncTask> task)
</span><span class="cx"> {
</span><span class="lines">@@ -224,6 +232,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
</span><span class="cx"> }));
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypeIndexedDBDatabases) {
</span><span class="cx"> // FIXME: Pick the right database store based on the session ID.
</span><span class="cx"> postDatabaseTask(std::make_unique<AsyncTask>([callbackAggregator, websiteDataTypes, this] {
</span><span class="lines">@@ -236,6 +245,7 @@
</span><span class="cx"> });
</span><span class="cx"> }));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><span class="lines">@@ -260,6 +270,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteData(callbackID), 0);
</span><span class="cx"> }));
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypeIndexedDBDatabases) {
</span><span class="cx"> postDatabaseTask(std::make_unique<AsyncTask>([this, callbackAggregator, modifiedSince] {
</span><span class="cx">
</span><span class="lines">@@ -267,6 +278,7 @@
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] { });
</span><span class="cx"> }));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
</span><span class="lines">@@ -291,6 +303,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
</span><span class="cx"> }));
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypeIndexedDBDatabases) {
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> securityOrigins;
</span><span class="cx"> for (const auto& securityOriginData : securityOriginDatas)
</span><span class="lines">@@ -302,8 +315,10 @@
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] { });
</span><span class="cx"> }));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> DatabaseProcess::indexedDatabaseOrigins()
</span><span class="cx"> {
</span><span class="cx"> if (m_indexedDatabaseDirectory.isEmpty())
</span><span class="lines">@@ -319,7 +334,9 @@
</span><span class="cx">
</span><span class="cx"> return securityOrigins;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> static void removeAllDatabasesForOriginPath(const String& originPath, std::chrono::system_clock::time_point modifiedSince)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We should also close/invalidate any live handles to the database files we are about to delete.
</span><span class="lines">@@ -373,6 +390,7 @@
</span><span class="cx"> for (auto& originPath : originPaths)
</span><span class="cx"> removeAllDatabasesForOriginPath(originPath, modifiedSince);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> class UniqueIDBDatabase;
</span><span class="cx">
</span><span class="cx"> struct DatabaseProcessCreationParameters;
</span><ins>+struct SecurityOriginData;
</ins><span class="cx">
</span><span class="cx"> class DatabaseProcess : public ChildProcess {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(DatabaseProcess);
</span><span class="lines">@@ -51,6 +52,7 @@
</span><span class="cx"> static DatabaseProcess& singleton();
</span><span class="cx"> ~DatabaseProcess();
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> const String& indexedDatabaseDirectory() const { return m_indexedDatabaseDirectory; }
</span><span class="cx">
</span><span class="cx"> RefPtr<UniqueIDBDatabase> getOrCreateUniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="lines">@@ -58,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> void ensureIndexedDatabaseRelativePathExists(const String&);
</span><span class="cx"> String absoluteIndexedDatabasePathFromDatabaseRelativePath(const String&);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> WorkQueue& queue() { return m_queue.get(); }
</span><span class="cx">
</span><span class="lines">@@ -89,9 +92,11 @@
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID);
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> indexedDatabaseOrigins();
</span><span class="cx"> void deleteIndexedDatabaseEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&);
</span><span class="cx"> void deleteIndexedDatabaseEntriesModifiedSince(std::chrono::system_clock::time_point modifiedSince);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // For execution on work queue thread only
</span><span class="cx"> void performNextDatabaseTask();
</span><span class="lines">@@ -101,9 +106,11 @@
</span><span class="cx">
</span><span class="cx"> Ref<WorkQueue> m_queue;
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> String m_indexedDatabaseDirectory;
</span><span class="cx">
</span><span class="cx"> HashMap<UniqueIDBDatabaseIdentifier, RefPtr<UniqueIDBDatabase>> m_idbDatabases;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> Deque<std::unique_ptr<AsyncTask>> m_databaseTasks;
</span><span class="cx"> Lock m_databaseTaskMutex;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseToWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -59,33 +59,39 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (decoder.messageReceiverName() == Messages::DatabaseProcessIDBConnection::messageReceiverName()) {
</span><span class="cx"> IDBConnectionMap::iterator backendIterator = m_idbConnections.find(decoder.destinationID());
</span><span class="cx"> if (backendIterator != m_idbConnections.end())
</span><span class="cx"> backendIterator->value->didReceiveDatabaseProcessIDBConnectionMessage(connection, decoder);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& reply)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (decoder.messageReceiverName() == Messages::DatabaseProcessIDBConnection::messageReceiverName()) {
</span><span class="cx"> IDBConnectionMap::iterator backendIterator = m_idbConnections.find(decoder.destinationID());
</span><span class="cx"> if (backendIterator != m_idbConnections.end())
</span><span class="cx"> backendIterator->value->didReceiveSyncDatabaseProcessIDBConnectionMessage(connection, decoder, reply);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseToWebProcessConnection::didClose(IPC::Connection&)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> // The WebProcess has disconnected, close all of the connections associated with it
</span><span class="cx"> while (!m_idbConnections.isEmpty())
</span><span class="cx"> removeDatabaseProcessIDBConnection(m_idbConnections.begin()->key);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseToWebProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
</span><span class="lines">@@ -93,6 +99,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> void DatabaseToWebProcessConnection::establishIDBConnection(uint64_t serverConnectionIdentifier)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<DatabaseProcessIDBConnection> idbConnection = DatabaseProcessIDBConnection::create(*this, serverConnectionIdentifier);
</span><span class="lines">@@ -106,6 +113,7 @@
</span><span class="cx"> RefPtr<DatabaseProcessIDBConnection> idbConnection = m_idbConnections.take(serverConnectionIdentifier);
</span><span class="cx"> idbConnection->disconnectedFromWebProcess();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDatabasesDatabaseProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseProcessCreationParameters.h"
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</del><ins>+#if ENABLE(DATABASE_PROCESS)
</ins><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx">
</span><span class="lines">@@ -38,20 +38,24 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> encoder << indexedDatabaseDirectory;
</span><span class="cx"> encoder << indexedDatabaseDirectoryExtensionHandle;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DatabaseProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, DatabaseProcessCreationParameters& result)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (!decoder.decode(result.indexedDatabaseDirectory))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.indexedDatabaseDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</del><ins>+#endif // ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedDatabasesDatabaseProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</del><ins>+#if ENABLE(DATABASE_PROCESS)
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="lines">@@ -45,11 +45,13 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, DatabaseProcessCreationParameters&);
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> String indexedDatabaseDirectory;
</span><span class="cx"> SandboxExtension::Handle indexedDatabaseDirectoryExtensionHandle;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</del><ins>+#endif // ENABLE(DATABASE_PROCESS)
</ins><span class="cx"> #endif // DatabaseProcessCreationParameters_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -469,15 +469,16 @@
</span><span class="cx">
</span><span class="cx"> m_databaseProcess = DatabaseProcessProxy::create(this);
</span><span class="cx">
</span><del>- ASSERT(!m_configuration->indexedDBDatabaseDirectory().isEmpty());
-
</del><span class="cx"> // *********
</span><span class="cx"> // IMPORTANT: Do not change the directory structure for indexed databases on disk without first consulting a reviewer from Apple (<rdar://problem/17454712>)
</span><span class="cx"> // *********
</span><span class="cx"> DatabaseProcessCreationParameters parameters;
</span><ins>+#if ENABLE(INDEXED_DATABASE)
+ ASSERT(!m_configuration->indexedDBDatabaseDirectory().isEmpty());
</ins><span class="cx"> parameters.indexedDatabaseDirectory = m_configuration->indexedDBDatabaseDirectory();
</span><span class="cx">
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.indexedDatabaseDirectory, parameters.indexedDatabaseDirectoryExtensionHandle);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> m_databaseProcess->send(Messages::DatabaseProcess::InitializeDatabaseProcess(parameters), 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesWebToDatabaseProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE)
</del><ins>+#if ENABLE(DATABASE_PROCESS)
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -51,12 +51,14 @@
</span><span class="cx">
</span><span class="cx"> void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> if (decoder.messageReceiverName() == Messages::WebIDBServerConnection::messageReceiverName()) {
</span><span class="cx"> HashMap<uint64_t, WebIDBServerConnection*>::iterator connectionIterator = m_webIDBServerConnections.find(decoder.destinationID());
</span><span class="cx"> if (connectionIterator != m_webIDBServerConnections.end())
</span><span class="cx"> connectionIterator->value->didReceiveWebIDBServerConnectionMessage(connection, decoder);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -70,6 +72,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> void WebToDatabaseProcessConnection::registerWebIDBServerConnection(WebIDBServerConnection& connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_webIDBServerConnections.contains(connection.messageSenderDestinationID()));
</span><span class="lines">@@ -85,7 +88,8 @@
</span><span class="cx">
</span><span class="cx"> m_webIDBServerConnections.remove(connection.messageSenderDestinationID());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(INDEXED_DATABASE)
</del><ins>+#endif // ENABLE(DATABASE_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesWebToDatabaseProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h (189243 => 189244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h 2015-09-02 02:31:37 UTC (rev 189243)
+++ trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h 2015-09-02 11:58:36 UTC (rev 189244)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE)
</del><ins>+#if ENABLE(DATABASE_PROCESS)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -48,8 +48,10 @@
</span><span class="cx">
</span><span class="cx"> IPC::Connection* connection() const { return m_connection.get(); }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> void registerWebIDBServerConnection(WebIDBServerConnection&);
</span><span class="cx"> void removeWebIDBServerConnection(WebIDBServerConnection&);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebToDatabaseProcessConnection(IPC::Connection::Identifier);
</span><span class="lines">@@ -67,10 +69,12 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> HashMap<uint64_t, WebIDBServerConnection*> m_webIDBServerConnections;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(INDEXED_DATABASE)
</del><ins>+#endif // ENABLE(DATABASE_PROCESS)
</ins><span class="cx"> #endif // WebToDatabaseProcessConnection_h
</span></span></pre>
</div>
</div>
</body>
</html>