<!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>[181775] 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/181775">181775</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-03-19 18:37:14 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for deleting individual cache entries
https://bugs.webkit.org/show_bug.cgi?id=142886
Reviewed by Antti Koivisto.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::fetchDiskCacheEntries):
Remove an unnecessary call to cfURLCacheOrigins().
(WebKit::clearDiskCacheEntries):
Helper function for clearing disk cache entries. This handles both the old and new cache implementations.
(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
Call clearDiskCacheEntries if needed.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181774 => 181775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-20 00:53:33 UTC (rev 181774)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-20 01:37:14 UTC (rev 181775)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-03-19 Anders Carlsson <andersca@apple.com>
+
+ Add support for deleting individual cache entries
+ https://bugs.webkit.org/show_bug.cgi?id=142886
+
+ Reviewed by Antti Koivisto.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::fetchDiskCacheEntries):
+ Remove an unnecessary call to cfURLCacheOrigins().
+
+ (WebKit::clearDiskCacheEntries):
+ Helper function for clearing disk cache entries. This handles both the old and new cache implementations.
+
+ (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+ Call clearDiskCacheEntries if needed.
+
</ins><span class="cx"> 2015-03-19 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Mac] Fullscreen animations with mismatched aspect ratios are "squished".
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (181774 => 181775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-20 00:53:33 UTC (rev 181774)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-20 01:37:14 UTC (rev 181775)
</span><span class="lines">@@ -297,7 +297,6 @@
</span><span class="cx"> Vector<WebsiteData::Entry> entries;
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><del>- auto origins = cfURLCacheOrigins();
</del><span class="cx"> for (auto& origin : cfURLCacheOrigins())
</span><span class="cx"> entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeDiskCache });
</span><span class="cx"> #endif
</span><span class="lines">@@ -366,6 +365,52 @@
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, std::function<void ()> completionHandler)
+{
+#if ENABLE(NETWORK_CACHE)
+ if (NetworkCache::singleton().isEnabled()) {
+ auto* originsToDelete = new HashSet<RefPtr<SecurityOrigin>>();
+
+ for (auto& origin : origins)
+ originsToDelete->add(origin.securityOrigin());
+
+ auto* cacheKeysToDelete = new Vector<NetworkCache::Key>;
+
+ NetworkCache::singleton().traverse([completionHandler, originsToDelete, cacheKeysToDelete](const NetworkCache::Entry *entry) {
+
+ if (entry) {
+ if (originsToDelete->contains(SecurityOrigin::create(entry->response.url())))
+ cacheKeysToDelete->append(entry->storageEntry.key);
+ return;
+ }
+
+ delete originsToDelete;
+
+ for (auto& key : *cacheKeysToDelete)
+ NetworkCache::singleton().remove(key);
+
+ delete cacheKeysToDelete;
+
+ RunLoop::main().dispatch(completionHandler);
+ return;
+ });
+
+ return;
+ }
+#endif
+
+#if USE(CFURLCACHE)
+ auto hostNames = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+ for (auto& origin : origins)
+ CFArrayAppendValue(hostNames.get(), origin.host.createCFString().get());
+
+ CFShow(hostNames.get());
+ WebResourceCacheManager::clearCFURLCacheForHostNames(hostNames.get());
+#endif
+
+ RunLoop::main().dispatch(WTF::move(completionHandler));
+}
+
</ins><span class="cx"> void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypeCookies) {
</span><span class="lines">@@ -379,6 +424,11 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ if ((websiteDataTypes & WebsiteDataTypeDiskCache) && !sessionID.isEphemeral()) {
+ clearDiskCacheEntries(origins, WTF::move(completionHandler));
+ return;
+ }
+
</ins><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>