<!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>[171808] branches/safari-600.1-branch/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/171808">171808</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-30 13:29:08 -0700 (Wed, 30 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171749">r171749</a>. <rdar://problem/15917314></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreWebCoreexpin">branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseProcesscpp">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseProcessh">branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedWebCrossThreadCopiercpp">branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedWebCrossThreadCopierh">branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebOriginDataManagerProxycpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebOriginDataManagerProxyh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebOriginDataManagerProxymessagesin">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessOriginDataWebOriginDataManagercpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-07-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171749
+
+ 2014-07-29 Brady Eidson <beidson@apple.com>
+
+ Make WKOriginDataManager actually operate on IndexedDatabases.
+ https://bugs.webkit.org/show_bug.cgi?id=135346
+
+ Reviewed by Sam Weinig (and David Kilzer and Alex Christensen)
+
+ * WebCore.exp.in:
+
+2014-07-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171718
</span><span class="cx">
</span><span class="cx"> 2014-07-28 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebCore/WebCore.exp.in 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -1065,6 +1065,8 @@
</span><span class="cx"> __ZN7WebCore37WidgetHierarchyUpdatesSuspensionScope11moveWidgetsEv
</span><span class="cx"> __ZN7WebCore37WidgetHierarchyUpdatesSuspensionScope35s_widgetHierarchyUpdateSuspendCountE
</span><span class="cx"> __ZN7WebCore3URL10invalidateEv
</span><ins>+__ZN7WebCore3URL11setProtocolERKN3WTF6StringE
+__ZN7WebCore3URL7setPathERKN3WTF6StringE
</ins><span class="cx"> __ZN7WebCore3URLC1ENS_18ParsedURLStringTagERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore3URLC1EP5NSURL
</span><span class="cx"> __ZN7WebCore3URLC1EPK7__CFURL
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-07-30 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171749
+
+ 2014-07-29 Brady Eidson <beidson@apple.com>
+
+ Make WKOriginDataManager actually operate on IndexedDatabases.
+ https://bugs.webkit.org/show_bug.cgi?id=135346
+
+ Reviewed by Sam Weinig (and David Kilzer and Alex Christensen)
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::DatabaseProcess):
+ (WebKit::DatabaseProcess::getIndexedDatabaseOrigins):
+ (WebKit::DatabaseProcess::doGetIndexedDatabaseOrigins):
+ (WebKit::removeAllDatabasesForOriginPath): Utility to delete all database files for the given origin path
+ that have been modified between the given dates.
+ (WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesForOrigin):
+ (WebKit::DatabaseProcess::doDeleteIndexedDatabaseEntriesForOrigin):
+ (WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesModifiedBetweenDates):
+ (WebKit::DatabaseProcess::doDeleteIndexedDatabaseEntriesModifiedBetweenDates):
+ (WebKit::DatabaseProcess::deleteAllIndexedDatabaseEntries):
+ (WebKit::DatabaseProcess::doDeleteAllIndexedDatabaseEntries):
+ * DatabaseProcess/DatabaseProcess.h:
+
+ * Shared/WebCrossThreadCopier.cpp:
+ (WebCore::SecurityOriginData>::copy):
+ * Shared/WebCrossThreadCopier.h:
+
+ * UIProcess/WebOriginDataManagerProxy.cpp:
+ (WebKit::WebOriginDataManagerProxy::getOrigins):
+ (WebKit::WebOriginDataManagerProxy::didGetOrigins):
+ (WebKit::WebOriginDataManagerProxy::deleteEntriesForOrigin):
+ (WebKit::WebOriginDataManagerProxy::deleteEntriesModifiedBetweenDates):
+ (WebKit::WebOriginDataManagerProxy::deleteAllEntries):
+
+ * WebProcess/OriginData/WebOriginDataManager.cpp:
+ (WebKit::WebOriginDataManager::getOrigins): Pipe IDB requests through to the DatabaseProcess.
+ (WebKit::WebOriginDataManager::deleteEntriesForOrigin): Ditto.
+ (WebKit::WebOriginDataManager::deleteEntriesModifiedBetweenDates): Ditto.
+ (WebKit::WebOriginDataManager::deleteAllEntries): Ditto.
+
</ins><span class="cx"> 2014-07-29 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171748
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -34,9 +34,12 @@
</span><span class="cx"> #include "DatabaseProcessProxyMessages.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><span class="cx"> #include "UniqueIDBDatabase.h"
</span><ins>+#include "WebCrossThreadCopier.h"
</ins><span class="cx"> #include "WebOriginDataManager.h"
</span><span class="cx"> #include "WebOriginDataManagerMessages.h"
</span><ins>+#include "WebOriginDataManagerProxyMessages.h"
</ins><span class="cx"> #include <WebCore/FileSystem.h>
</span><ins>+#include <WebCore/TextEncoding.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -53,6 +56,9 @@
</span><span class="cx"> : m_queue(adoptRef(*WorkQueue::create("com.apple.WebKit.DatabaseProcess").leakRef()))
</span><span class="cx"> , m_webOriginDataManager(std::make_unique<WebOriginDataManager>(this))
</span><span class="cx"> {
</span><ins>+ // Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it.
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=135365 - Need a more explicit way of doing this besides accessing the UTF8Encoding.
+ UTF8Encoding();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseProcess::~DatabaseProcess()
</span><span class="lines">@@ -185,6 +191,126 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcess::getIndexedDatabaseOrigins(uint64_t callbackID)
+{
+ postDatabaseTask(createAsyncTask(*this, &DatabaseProcess::doGetIndexedDatabaseOrigins, callbackID));
+}
+
+void DatabaseProcess::doGetIndexedDatabaseOrigins(uint64_t callbackID)
+{
+ Vector<SecurityOriginData> results;
+
+ if (m_indexedDatabaseDirectory.isEmpty()) {
+ send(Messages::WebOriginDataManagerProxy::DidGetOrigins(results, callbackID), 0);
+ return;
+ }
+
+ Vector<String> originPaths = listDirectory(m_indexedDatabaseDirectory, "*");
+ for (auto& originPath : originPaths) {
+ URL url;
+ url.setProtocol(ASCIILiteral("file"));
+ url.setPath(originPath);
+
+ String databaseIdentifier = url.lastPathComponent();
+
+ RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::maybeCreateFromDatabaseIdentifier(databaseIdentifier);
+ if (!securityOrigin)
+ continue;
+
+ results.append(SecurityOriginData::fromSecurityOrigin(securityOrigin.get()));
+ }
+
+ send(Messages::WebOriginDataManagerProxy::DidGetOrigins(results, callbackID), 0);
+}
+
+static void removeAllDatabasesForOriginPath(const String& originPath, double startDate, double endDate)
+{
+ // FIXME: We should also close/invalidate any live handles to the database files we are about to delete.
+ // Right now:
+ // - For read-only operations, they will continue functioning as normal on the unlinked file.
+ // - For write operations, they will start producing errors as SQLite notices the missing backing store.
+ // This is tracked by https://bugs.webkit.org/show_bug.cgi?id=135347
+
+ Vector<String> databasePaths = listDirectory(originPath, "*");
+
+ for (auto& databasePath : databasePaths) {
+ String databaseFile = pathByAppendingComponent(databasePath, "IndexedDB.sqlite3");
+
+ if (!fileExists(databaseFile))
+ continue;
+
+ time_t modTime;
+ getFileModificationTime(databaseFile, modTime);
+
+ if (modTime < startDate || modTime > endDate)
+ continue;
+
+ deleteFile(databaseFile);
+ deleteEmptyDirectory(databasePath);
+ }
+
+ deleteEmptyDirectory(originPath);
+}
+
+void DatabaseProcess::deleteIndexedDatabaseEntriesForOrigin(const SecurityOriginData& origin, uint64_t callbackID)
+{
+ postDatabaseTask(createAsyncTask(*this, &DatabaseProcess::doDeleteIndexedDatabaseEntriesForOrigin, origin, callbackID));
+}
+
+void DatabaseProcess::doDeleteIndexedDatabaseEntriesForOrigin(const SecurityOriginData& originData, uint64_t callbackID)
+{
+ if (m_indexedDatabaseDirectory.isEmpty()) {
+ send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
+ return;
+ }
+
+ RefPtr<SecurityOrigin> origin = originData.securityOrigin();
+ String databaseIdentifier = origin->databaseIdentifier();
+ String originPath = pathByAppendingComponent(m_indexedDatabaseDirectory, databaseIdentifier);
+
+ removeAllDatabasesForOriginPath(originPath, std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
+
+ send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
+}
+
+void DatabaseProcess::deleteIndexedDatabaseEntriesModifiedBetweenDates(double startDate, double endDate, uint64_t callbackID)
+{
+ postDatabaseTask(createAsyncTask(*this, &DatabaseProcess::doDeleteIndexedDatabaseEntriesModifiedBetweenDates, startDate, endDate, callbackID));
+}
+
+void DatabaseProcess::doDeleteIndexedDatabaseEntriesModifiedBetweenDates(double startDate, double endDate, uint64_t callbackID)
+{
+ if (m_indexedDatabaseDirectory.isEmpty()) {
+ send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
+ return;
+ }
+
+ Vector<String> originPaths = listDirectory(m_indexedDatabaseDirectory, "*");
+ for (auto& originPath : originPaths)
+ removeAllDatabasesForOriginPath(originPath, startDate, endDate);
+
+ send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
+}
+
+void DatabaseProcess::deleteAllIndexedDatabaseEntries(uint64_t callbackID)
+{
+ postDatabaseTask(createAsyncTask(*this, &DatabaseProcess::doDeleteAllIndexedDatabaseEntries, callbackID));
+}
+
+void DatabaseProcess::doDeleteAllIndexedDatabaseEntries(uint64_t callbackID)
+{
+ if (m_indexedDatabaseDirectory.isEmpty()) {
+ send(Messages::WebOriginDataManagerProxy::DidDeleteAllEntries(callbackID), 0);
+ return;
+ }
+
+ Vector<String> originPaths = listDirectory(m_indexedDatabaseDirectory, "*");
+ for (auto& originPath : originPaths)
+ removeAllDatabasesForOriginPath(originPath, std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
+
+ send(Messages::WebOriginDataManagerProxy::DidDeleteAllEntries(callbackID), 0);
+}
+
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -60,6 +60,11 @@
</span><span class="cx">
</span><span class="cx"> WorkQueue& queue() { return m_queue.get(); }
</span><span class="cx">
</span><ins>+ void getIndexedDatabaseOrigins(uint64_t callbackID);
+ void deleteIndexedDatabaseEntriesForOrigin(const SecurityOriginData&, uint64_t callbackID);
+ void deleteIndexedDatabaseEntriesModifiedBetweenDates(double startDate, double endDate, uint64_t callbackID);
+ void deleteAllIndexedDatabaseEntries(uint64_t callbackID);
+
</ins><span class="cx"> private:
</span><span class="cx"> DatabaseProcess();
</span><span class="cx">
</span><span class="lines">@@ -85,6 +90,10 @@
</span><span class="cx"> // For execution on work queue thread only
</span><span class="cx"> void performNextDatabaseTask();
</span><span class="cx"> void ensurePathExists(const String&);
</span><ins>+ void doGetIndexedDatabaseOrigins(uint64_t callbackID);
+ void doDeleteIndexedDatabaseEntriesForOrigin(const SecurityOriginData&, uint64_t callbackID);
+ void doDeleteIndexedDatabaseEntriesModifiedBetweenDates(double startDate, double endDate, uint64_t callbackID);
+ void doDeleteAllIndexedDatabaseEntries(uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedWebCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.cpp (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.cpp 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "IDBIdentifier.h"
</span><ins>+#include "SecurityOriginData.h"
</ins><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <WebCore/IDBKeyData.h>
</span><span class="cx">
</span><span class="lines">@@ -79,6 +80,11 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SecurityOriginData CrossThreadCopierBase<false, false, SecurityOriginData>::copy(const SecurityOriginData& securityOriginData)
+{
+ return securityOriginData.isolatedCopy();
+}
+
</ins><span class="cx"> ASCIILiteral CrossThreadCopierBase<false, false, ASCIILiteral>::copy(const ASCIILiteral& literal)
</span><span class="cx"> {
</span><span class="cx"> return literal;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedWebCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.h (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.h 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/WebCrossThreadCopier.h 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> class UniqueIDBDatabaseIdentifier;
</span><span class="cx">
</span><span class="cx"> enum class UniqueIDBDatabaseShutdownType;
</span><ins>+
+struct SecurityOriginData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -60,6 +62,10 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct CrossThreadCopierBase<false, false, WebKit::SecurityOriginData> {
+ static WebKit::SecurityOriginData copy(const WebKit::SecurityOriginData& type);
+};
+
</ins><span class="cx"> template<> struct CrossThreadCopierBase<false, false, Vector<char>> {
</span><span class="cx"> static Vector<char> copy(const Vector<char>&);
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebOriginDataManagerProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -31,7 +31,11 @@
</span><span class="cx"> #include "WebOriginDataManagerMessages.h"
</span><span class="cx"> #include "WebOriginDataManagerProxyMessages.h"
</span><span class="cx"> #include "WebSecurityOrigin.h"
</span><ins>+#include <WebCore/SecurityOrigin.h>
+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> const char* WebOriginDataManagerProxy::supplementName()
</span><span class="lines">@@ -82,6 +86,14 @@
</span><span class="cx">
</span><span class="cx"> void WebOriginDataManagerProxy::getOrigins(WKOriginDataTypes types, std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><ins>+ // FIXME: Right now we only support IndexedDatabase data so we know that we're only sending this request to the DatabaseProcess.
+ // That's why having one single callback works.
+ // In the future when we message N-processes we'll have to wait for all N replies before responding to the client.
+ if (!(types & kWKIndexedDatabaseData)) {
+ callbackFunction(nullptr, CallbackBase::Error::None);
+ return;
+ }
+
</ins><span class="cx"> RefPtr<ArrayCallback> callback = ArrayCallback::create(WTF::move(callbackFunction));
</span><span class="cx">
</span><span class="cx"> if (!context()) {
</span><span class="lines">@@ -92,24 +104,32 @@
</span><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span><del>- // FIXME (Multi-WebProcess): <rdar://problem/12239765> Make manipulating cache information work with per-tab WebProcess.
- context()->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebOriginDataManager::GetOrigins(types, callbackID));
</del><ins>+ context()->sendToDatabaseProcessRelaunchingIfNecessary(Messages::WebOriginDataManager::GetOrigins(types, callbackID));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManagerProxy::didGetOrigins(const Vector<SecurityOriginData>& originDatas, uint64_t callbackID)
</del><ins>+void WebOriginDataManagerProxy::didGetOrigins(IPC::Connection* connection, const Vector<SecurityOriginData>& originIdentifiers, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
</span><del>- performAPICallbackWithSecurityOriginDataVector(originDatas, callback.get());
</del><ins>+ MESSAGE_CHECK_BASE(callback, connection);
+
+ Vector<RefPtr<API::Object>> securityOrigins;
+ securityOrigins.reserveInitialCapacity(originIdentifiers.size());
+
+ for (const auto& originIdentifier : originIdentifiers)
+ securityOrigins.uncheckedAppend(WebSecurityOrigin::create(originIdentifier.securityOrigin()));
+
+ callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebOriginDataManagerProxy::deleteEntriesForOrigin(WKOriginDataTypes types, WebSecurityOrigin* origin, std::function<void (CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- if (!(types & kWKIndexedDatabaseData))
- return;
-
</del><span class="cx"> // FIXME: Right now we only support IndexedDatabase data so we know that we're only sending this request to the DatabaseProcess.
</span><span class="cx"> // That's why having one single callback works.
</span><span class="cx"> // In the future when we message N-processes we'll have to wait for all N replies before responding to the client.
</span><ins>+ if (!(types & kWKIndexedDatabaseData)) {
+ callbackFunction(CallbackBase::Error::None);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> RefPtr<VoidCallback> callback = VoidCallback::create(WTF::move(callbackFunction));
</span><span class="cx">
</span><span class="lines">@@ -131,12 +151,13 @@
</span><span class="cx">
</span><span class="cx"> void WebOriginDataManagerProxy::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void (CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- if (!(types & kWKIndexedDatabaseData))
- return;
-
</del><span class="cx"> // FIXME: Right now we only support IndexedDatabase data so we know that we're only sending this request to the DatabaseProcess.
</span><span class="cx"> // That's why having one single callback works.
</span><span class="cx"> // In the future when we message N-processes we'll have to wait for all N replies before responding to the client.
</span><ins>+ if (!(types & kWKIndexedDatabaseData)) {
+ callbackFunction(CallbackBase::Error::None);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> RefPtr<VoidCallback> callback = VoidCallback::create(WTF::move(callbackFunction));
</span><span class="cx">
</span><span class="lines">@@ -151,20 +172,22 @@
</span><span class="cx"> context()->sendToDatabaseProcessRelaunchingIfNecessary(Messages::WebOriginDataManager::DeleteEntriesModifiedBetweenDates(types, startDate, endDate, callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManagerProxy::didDeleteEntries(uint64_t callbackID)
</del><ins>+void WebOriginDataManagerProxy::didDeleteEntries(IPC::Connection* connection, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<VoidCallback> callback = m_voidCallbacks.take(callbackID);
</span><ins>+ MESSAGE_CHECK_BASE(callback, connection);
</ins><span class="cx"> callback->performCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebOriginDataManagerProxy::deleteAllEntries(WKOriginDataTypes types, std::function<void (CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- if (!(types & kWKIndexedDatabaseData))
- return;
-
</del><span class="cx"> // FIXME: Right now we only support IndexedDatabase data so we know that we're only sending this request to the DatabaseProcess.
</span><span class="cx"> // That's why having one single callback works.
</span><span class="cx"> // In the future when we message N-processes we'll have to wait for all N replies before responding to the client.
</span><ins>+ if (!(types & kWKIndexedDatabaseData)) {
+ callbackFunction(CallbackBase::Error::None);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> RefPtr<VoidCallback> callback = VoidCallback::create(WTF::move(callbackFunction));
</span><span class="cx">
</span><span class="lines">@@ -179,9 +202,10 @@
</span><span class="cx"> context()->sendToDatabaseProcessRelaunchingIfNecessary(Messages::WebOriginDataManager::DeleteAllEntries(types, callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManagerProxy::didDeleteAllEntries(uint64_t callbackID)
</del><ins>+void WebOriginDataManagerProxy::didDeleteAllEntries(IPC::Connection* connection, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<VoidCallback> callback = m_voidCallbacks.take(callbackID);
</span><ins>+ MESSAGE_CHECK_BASE(callback, connection);
</ins><span class="cx"> callback->performCallback();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebOriginDataManagerProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebOriginDataManagerProxy(WebContext*);
</span><span class="cx">
</span><del>- void didGetOrigins(const Vector<SecurityOriginData>&, uint64_t callbackID);
- void didDeleteEntries(uint64_t callbackID);
- void didDeleteAllEntries(uint64_t callbackID);
</del><ins>+ void didGetOrigins(IPC::Connection*, const Vector<SecurityOriginData>&, uint64_t callbackID);
+ void didDeleteEntries(IPC::Connection*, uint64_t callbackID);
+ void didDeleteAllEntries(IPC::Connection*, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> // WebContextSupplement
</span><span class="cx"> virtual void contextDestroyed() override;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebOriginDataManagerProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> WebOriginDataManagerProxy {
</span><del>- DidGetOrigins(Vector<WebKit::SecurityOriginData> originIdentifiers, uint64_t callbackID);
- DidDeleteEntries(uint64_t callbackID);
- DidDeleteAllEntries(uint64_t callbackID);
</del><ins>+ DidGetOrigins(Vector<WebKit::SecurityOriginData> originIdentifiers, uint64_t callbackID) WantsConnection
+ DidDeleteEntries(uint64_t callbackID) WantsConnection
+ DidDeleteAllEntries(uint64_t callbackID) WantsConnection
</ins><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessOriginDataWebOriginDataManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp (171807 => 171808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp 2014-07-30 20:26:34 UTC (rev 171807)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp 2014-07-30 20:29:08 UTC (rev 171808)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebOriginDataManager.h"
</span><span class="cx">
</span><del>-#include "ChildProcess.h"
</del><ins>+#include "DatabaseProcess.h"
</ins><span class="cx"> #include "SecurityOriginData.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebOriginDataManagerMessages.h"
</span><span class="lines">@@ -51,48 +51,54 @@
</span><span class="cx"> m_childProcess->addMessageReceiver(Messages::WebOriginDataManager::messageReceiverName(), *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManager::getOrigins(WKOriginDataTypes, uint64_t callbackID)
</del><ins>+void WebOriginDataManager::getOrigins(WKOriginDataTypes types, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- HashSet<RefPtr<SecurityOrigin>> origins;
-
- // FIXME: populate origins
-
- Vector<SecurityOriginData> identifiers;
- identifiers.reserveCapacity(origins.size());
-
- HashSet<RefPtr<SecurityOrigin>>::iterator end = origins.end();
- HashSet<RefPtr<SecurityOrigin>>::iterator i = origins.begin();
- for (; i != end; ++i) {
- RefPtr<SecurityOrigin> origin = *i;
-
- SecurityOriginData originData;
- originData.protocol = origin->protocol();
- originData.host = origin->host();
- originData.port = origin->port();
-
- identifiers.uncheckedAppend(originData);
</del><ins>+ // FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
+ // If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
+ // for multiple types into the one callback.
+ if (types & kWKIndexedDatabaseData) {
+ DatabaseProcess::shared().getIndexedDatabaseOrigins(callbackID);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_childProcess->send(Messages::WebOriginDataManagerProxy::DidGetOrigins(identifiers, callbackID), 0);
</del><ins>+ Vector<SecurityOriginData> results;
+ m_childProcess->send(Messages::WebOriginDataManagerProxy::DidGetOrigins(results, callbackID), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManager::deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData& origindata, uint64_t callbackID)
</del><ins>+void WebOriginDataManager::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& originData, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- // FIXME: delete entries for origin
</del><ins>+ // FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
+ // If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
+ // for multiple types into the one callback.
+ if (types & kWKIndexedDatabaseData) {
+ DatabaseProcess::shared().deleteIndexedDatabaseEntriesForOrigin(originData, callbackID);
+ return;
+ }
+
</ins><span class="cx"> m_childProcess->send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManager::deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double, double, uint64_t callbackID)
</del><ins>+void WebOriginDataManager::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startTime, double endTime, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- // FIXME: delete entries modified between the start and end date
-
</del><ins>+ // FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
+ // If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
+ // for multiple types into the one callback.
+ if (types & kWKIndexedDatabaseData) {
+ DatabaseProcess::shared().deleteIndexedDatabaseEntriesModifiedBetweenDates(startTime, endTime, callbackID);
+ return;
+ }
</ins><span class="cx"> m_childProcess->send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManager::deleteAllEntries(WKOriginDataTypes, uint64_t callbackID)
</del><ins>+void WebOriginDataManager::deleteAllEntries(WKOriginDataTypes types, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- // FIXME: delete entries
-
</del><ins>+ // FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
+ // If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
+ // for multiple types into the one callback.
+ if (types & kWKIndexedDatabaseData) {
+ DatabaseProcess::shared().deleteAllIndexedDatabaseEntries(callbackID);
+ return;
+ }
</ins><span class="cx"> m_childProcess->send(Messages::WebOriginDataManagerProxy::DidDeleteAllEntries(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>