<!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>[180841] 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/180841">180841</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-28 13:52:59 -0800 (Sat, 28 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fetch cache origins from the network process
https://bugs.webkit.org/show_bug.cgi?id=142135
Reviewed by Dan Bernstein.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::cfURLCacheOrigins):
Add a new helper function that returns a vector of CFURL cache origins.
(WebKit::fetchDiskCacheOrigins):
Fetch the disk cache origins and pass them along to the completion handler. Currently we don't handle the new disk cache.
(WebKit::NetworkProcess::fetchWebsiteData):
Create a callback aggregator and fetch disk cache origins if we're asked for it.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::computeNetworkProcessAccessTypeForDataFetch):
New helper function that computes if we need to launch the network process in order to fetch data.
(WebKit::WebsiteDataStore::fetchData):
Fetch website data from the network process as well.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180840 => 180841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-28 21:41:42 UTC (rev 180840)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-28 21:52:59 UTC (rev 180841)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-02-28 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Fetch cache origins from the network process
+ https://bugs.webkit.org/show_bug.cgi?id=142135
+
+ Reviewed by Dan Bernstein.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::cfURLCacheOrigins):
+ Add a new helper function that returns a vector of CFURL cache origins.
+
+ (WebKit::fetchDiskCacheOrigins):
+ Fetch the disk cache origins and pass them along to the completion handler. Currently we don't handle the new disk cache.
+
+ (WebKit::NetworkProcess::fetchWebsiteData):
+ Create a callback aggregator and fetch disk cache origins if we're asked for it.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::computeNetworkProcessAccessTypeForDataFetch):
+ New helper function that computes if we need to launch the network process in order to fetch data.
+
+ (WebKit::WebsiteDataStore::fetchData):
+ Fetch website data from the network process as well.
+
+2015-02-28 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Simplify WebResourceCacheManagerCFNet.mm code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142134
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (180840 => 180841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-02-28 21:41:42 UTC (rev 180840)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-02-28 21:52:59 UTC (rev 180841)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><ins>+#include "WebResourceCacheManager.h"
</ins><span class="cx"> #include "WebsiteData.h"
</span><span class="cx"> #include <WebCore/Logging.h>
</span><span class="cx"> #include <WebCore/MemoryPressureHandler.h>
</span><span class="lines">@@ -241,12 +242,80 @@
</span><span class="cx"> SessionTracker::destroySession(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(CFURLCACHE)
+static Vector<RefPtr<SecurityOrigin>> cfURLCacheOrigins()
+{
+ Vector<RefPtr<SecurityOrigin>> result;
+
+ WebResourceCacheManager::cfURLCacheHostNamesWithCallback([&result](RetainPtr<CFArrayRef> cfURLHosts) {
+ for (CFIndex i = 0, size = CFArrayGetCount(cfURLHosts.get()); i < size; ++i) {
+ CFStringRef host = static_cast<CFStringRef>(CFArrayGetValueAtIndex(cfURLHosts.get(), i));
+
+ result.append(SecurityOrigin::create("http", host, 0));
+ }
+ });
+
+ return result;
+}
+#endif
+
+static void fetchDiskCacheEntries(SessionID sessionID, std::function<void (Vector<WebsiteData::Entry>)> completionHandler)
+{
+#if ENABLE(NETWORK_CACHE)
+ if (NetworkCache::singleton().isEnabled()) {
+ // FIXME: Handle this.
+ RunLoop::main().dispatch([completionHandler] {
+ completionHandler({ });
+ });
+
+ return;
+ }
+#endif
+
+ Vector<WebsiteData::Entry> entries;
+
+#if USE(CFURLCACHE)
+ auto origins = cfURLCacheOrigins();
+ for (auto& origin : cfURLCacheOrigins())
+ entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeDiskCache });
+#endif
+
+ RunLoop::main().dispatch([completionHandler, entries] {
+ completionHandler(entries);
+ });
+}
+
</ins><span class="cx"> void NetworkProcess::fetchWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- // FIXME: Actually return data.
- WebsiteData websiteData;
</del><ins>+ struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
+ explicit CallbackAggregator(std::function<void (WebsiteData)> completionHandler)
+ : m_completionHandler(WTF::move(completionHandler))
+ {
+ }
</ins><span class="cx">
</span><del>- parentProcessConnection()->send(Messages::NetworkProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
</del><ins>+ ~CallbackAggregator()
+ {
+ auto completionHandler = WTF::move(m_completionHandler);
+ auto websiteData = WTF::move(m_websiteData);
+
+ RunLoop::main().dispatch([completionHandler, websiteData] {
+ completionHandler(websiteData);
+ });
+ }
+
+ std::function<void (WebsiteData)> m_completionHandler;
+ WebsiteData m_websiteData;
+ };
+
+ RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator([this, callbackID](WebsiteData websiteData) {
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
+ }));
+
+ if (websiteDataTypes & WebsiteDataTypeDiskCache) {
+ fetchDiskCacheEntries(sessionID, [callbackAggregator](Vector<WebsiteData::Entry> entries) {
+ callbackAggregator->m_websiteData.entries.appendVector(entries);
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (180840 => 180841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-28 21:41:42 UTC (rev 180840)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-28 21:52:59 UTC (rev 180841)
</span><span class="lines">@@ -100,6 +100,23 @@
</span><span class="cx"> Launch,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+static ProcessAccessType computeNetworkProcessAccessTypeForDataFetch(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
+{
+ ProcessAccessType processAccessType = ProcessAccessType::None;
+
+ if (dataTypes & WebsiteDataTypeCookies) {
+ if (isNonPersistentStore)
+ processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
+ else
+ processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
+ }
+
+ if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
+ processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
+
+ return processAccessType;
+}
+
</ins><span class="cx"> static ProcessAccessType computeWebProcessAccessTypeForDataFetch(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(isNonPersistentStore);
</span><span class="lines">@@ -176,6 +193,34 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTF::move(completionHandler)));
</span><span class="cx">
</span><ins>+ auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, isNonPersistent());
+ if (networkProcessAccessType != ProcessAccessType::None) {
+ HashSet<WebProcessPool*> processPools;
+ for (auto& process : processes())
+ processPools.add(&process->processPool());
+
+ for (auto& processPool : processPools) {
+ switch (networkProcessAccessType) {
+ case ProcessAccessType::OnlyIfLaunched:
+ if (!processPool->networkProcess())
+ continue;
+ break;
+
+ case ProcessAccessType::Launch:
+ processPool->ensureNetworkProcess();
+ break;
+
+ case ProcessAccessType::None:
+ ASSERT_NOT_REACHED();
+ }
+
+ callbackAggregator->addPendingCallback();
+ processPool->networkProcess()->fetchWebsiteData(m_sessionID, dataTypes, [callbackAggregator](WebsiteData websiteData) {
+ callbackAggregator->removePendingCallback(WTF::move(websiteData));
+ });
+ }
+ }
+
</ins><span class="cx"> auto webProcessAccessType = computeWebProcessAccessTypeForDataFetch(dataTypes, isNonPersistent());
</span><span class="cx"> if (webProcessAccessType != ProcessAccessType::None) {
</span><span class="cx"> for (auto& process : processes()) {
</span></span></pre>
</div>
</div>
</body>
</html>