<!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>[199256] 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/199256">199256</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-04-08 17:33:12 -0700 (Fri, 08 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix with IndexedDB disabled but DatabaseProcess enabled after <a href="http://trac.webkit.org/projects/webkit/changeset/199230">r199230</a>
https://bugs.webkit.org/show_bug.cgi?id=156321
Rubber-stamped by Brady Eidson.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
(WebKit::DatabaseProcess::grantSandboxExtensionsForBlobs):
(WebKit::DatabaseProcess::accessToTemporaryFileComplete):
(WebKit::DatabaseProcess::indexedDatabaseOrigins):
* DatabaseProcess/DatabaseProcess.h:
Add some more guards.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199255 => 199256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-08 23:01:01 UTC (rev 199255)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-09 00:33:12 UTC (rev 199256)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-08 Alex Christensen <achristensen@webkit.org>
+
+ Build fix with IndexedDB disabled but DatabaseProcess enabled after r199230
+ https://bugs.webkit.org/show_bug.cgi?id=156321
+
+ Rubber-stamped by Brady Eidson.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
+ (WebKit::DatabaseProcess::grantSandboxExtensionsForBlobs):
+ (WebKit::DatabaseProcess::accessToTemporaryFileComplete):
+ (WebKit::DatabaseProcess::indexedDatabaseOrigins):
+ * DatabaseProcess/DatabaseProcess.h:
+ Add some more guards.
+
</ins><span class="cx"> 2016-04-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Stop using exposedContentRect for history scroll state restoration
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (199255 => 199256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-04-08 23:01:01 UTC (rev 199255)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-04-09 00:33:12 UTC (rev 199256)
</span><span class="lines">@@ -305,6 +305,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(paths.size() == handles.size());
</span><span class="lines">@@ -332,7 +333,6 @@
</span><span class="cx"> extension->revoke();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(INDEXED_DATABASE)
</del><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> DatabaseProcess::indexedDatabaseOrigins()
</span><span class="cx"> {
</span><span class="cx"> if (m_indexedDatabaseDirectory.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (199255 => 199256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-04-08 23:01:01 UTC (rev 199255)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-04-09 00:33:12 UTC (rev 199256)
</span><span class="lines">@@ -47,7 +47,11 @@
</span><span class="cx"> enum class WebsiteDataType;
</span><span class="cx"> struct DatabaseProcessCreationParameters;
</span><span class="cx">
</span><del>-class DatabaseProcess : public ChildProcess, public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler {
</del><ins>+class DatabaseProcess : public ChildProcess
+#if ENABLE(INDEXED_DATABASE)
+ , public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler
+#endif
+{
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(DatabaseProcess);
</span><span class="cx"> friend class NeverDestroyed<DatabaseProcess>;
</span><span class="cx"> public:
</span><span class="lines">@@ -67,9 +71,11 @@
</span><span class="cx">
</span><span class="cx"> void postDatabaseTask(std::unique_ptr<WebCore::CrossThreadTask>);
</span><span class="cx">
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> // WebCore::IDBServer::IDBBackingStoreFileHandler
</span><span class="cx"> void prepareForAccessToTemporaryFile(const String& path) final;
</span><span class="cx"> void accessToTemporaryFileComplete(const String& path) final;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DatabaseProcess();
</span><span class="lines">@@ -96,9 +102,9 @@
</span><span class="cx"> void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
</span><span class="cx"> void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</span><del>- void grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray&);
</del><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><ins>+ void grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray&);
</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></span></pre>
</div>
</div>
</body>
</html>