<!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>[180899] 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/180899">180899</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-03-02 15:25:07 -0800 (Mon, 02 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Return disk cache entries from the new disk cache
https://bugs.webkit.org/show_bug.cgi?id=142190
Reviewed by Antti Koivisto.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::fetchDiskCacheEntries):
Call NetworkCache::traverse() to get all the cache entries, unique their origins and pass them back with the completion handler.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::traverse):
New helper function that traverses network cache entries.
* NetworkProcess/cache/NetworkCache.h:</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180898 => 180899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-02 22:54:50 UTC (rev 180898)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-02 23:25:07 UTC (rev 180899)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-03-02 Anders Carlsson <andersca@apple.com>
+
+ Return disk cache entries from the new disk cache
+ https://bugs.webkit.org/show_bug.cgi?id=142190
+
+ Reviewed by Antti Koivisto.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::fetchDiskCacheEntries):
+ Call NetworkCache::traverse() to get all the cache entries, unique their origins and pass them back with the completion handler.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::traverse):
+ New helper function that traverses network cache entries.
+
+ * NetworkProcess/cache/NetworkCache.h:
+
</ins><span class="cx"> 2015-03-02 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Add way to dump cache meta data to file
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (180898 => 180899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-02 22:54:50 UTC (rev 180898)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-02 23:25:07 UTC (rev 180899)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #include <WebCore/MemoryPressureHandler.h>
</span><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><ins>+#include <WebCore/SecurityOriginHash.h>
</ins><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -58,6 +59,10 @@
</span><span class="cx"> #include "SecItemShim.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_CACHE)
+#include "NetworkCacheCoders.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -263,9 +268,25 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (NetworkCache::singleton().isEnabled()) {
</span><del>- // FIXME: Handle this.
- RunLoop::main().dispatch([completionHandler] {
- completionHandler({ });
</del><ins>+ auto* origins = new HashSet<RefPtr<SecurityOrigin>>();
+
+ NetworkCache::singleton().traverse([completionHandler, origins](const NetworkCache::Entry *entry) {
+ if (!entry) {
+ Vector<WebsiteData::Entry> entries;
+
+ for (auto& origin : *origins)
+ entries.append(WebsiteData::Entry { origin, WebsiteDataTypeDiskCache });
+
+ delete origins;
+
+ RunLoop::main().dispatch([completionHandler, entries] {
+ completionHandler(entries);
+ });
+
+ return;
+ }
+
+ origins->add(SecurityOrigin::create(entry->response.url()));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (180898 => 180899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-02 22:54:50 UTC (rev 180898)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-02 23:25:07 UTC (rev 180899)
</span><span class="lines">@@ -370,6 +370,27 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkCache::traverse(std::function<void (const Entry*)>&& traverseHandler)
+{
+ ASSERT(isEnabled());
+
+ m_storage->traverse([traverseHandler](const NetworkCacheKey& key, const NetworkCacheStorage::Entry* entry) {
+ if (!entry) {
+ traverseHandler(nullptr);
+ return;
+ }
+
+ NetworkCache::Entry cacheEntry;
+ cacheEntry.storageEntry = *entry;
+
+ NetworkCacheDecoder decoder(cacheEntry.storageEntry.header.data(), cacheEntry.storageEntry.header.size());
+ if (!decoder.decode(cacheEntry.response))
+ return;
+
+ traverseHandler(&cacheEntry);
+ });
+}
+
</ins><span class="cx"> String NetworkCache::dumpFilePath() const
</span><span class="cx"> {
</span><span class="cx"> return WebCore::pathByAppendingComponent(m_storage->baseDirectoryPath(), "dump.json");
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (180898 => 180899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-03-02 22:54:50 UTC (rev 180898)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-03-02 23:25:07 UTC (rev 180899)
</span><span class="lines">@@ -99,6 +99,8 @@
</span><span class="cx"> void store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, std::function<void (MappedBody&)>);
</span><span class="cx"> void update(const WebCore::ResourceRequest&, const Entry&, const WebCore::ResourceResponse& validatingResponse);
</span><span class="cx">
</span><ins>+ void traverse(std::function<void (const Entry*)>&&);
+
</ins><span class="cx"> void clear();
</span><span class="cx">
</span><span class="cx"> void dumpContentsToFile();
</span></span></pre>
</div>
</div>
</body>
</html>