<!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>[185605] 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/185605">185605</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 13:27:51 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop calling into WebResourceCacheManager
https://bugs.webkit.org/show_bug.cgi?id=146026
Reviewed by Andreas Kling.
Copy the cache clearing code into NetworkProcessCocoa in preparation of getting rid of
the WebResourceCacheManager code.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::fetchDiskCacheEntries):
(WebKit::clearDiskCacheEntries):
(WebKit::cfURLCacheOrigins): Deleted.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::partitionName):
(WebKit::NetworkProcess::cfURLCacheOrigins):
(WebKit::NetworkProcess::clearCFURLCacheForOrigins):</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="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185604 => 185605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-16 20:24:55 UTC (rev 185604)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-16 20:27:51 UTC (rev 185605)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-06-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Stop calling into WebResourceCacheManager
+ https://bugs.webkit.org/show_bug.cgi?id=146026
+
+ Reviewed by Andreas Kling.
+
+ Copy the cache clearing code into NetworkProcessCocoa in preparation of getting rid of
+ the WebResourceCacheManager code.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::fetchDiskCacheEntries):
+ (WebKit::clearDiskCacheEntries):
+ (WebKit::cfURLCacheOrigins): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::partitionName):
+ (WebKit::NetworkProcess::cfURLCacheOrigins):
+ (WebKit::NetworkProcess::clearCFURLCacheForOrigins):
+
+2015-06-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of the application cache manager classes, they are no longer used
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146024
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (185604 => 185605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-06-16 20:24:55 UTC (rev 185604)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-06-16 20:27:51 UTC (rev 185605)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><del>-#include "WebResourceCacheManager.h"
</del><span class="cx"> #include "WebsiteData.h"
</span><span class="cx"> #include <WebCore/Logging.h>
</span><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="lines">@@ -266,23 +265,6 @@
</span><span class="cx"> SessionTracker::destroySession(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(CFURLCACHE)
-static Vector<Ref<SecurityOrigin>> cfURLCacheOrigins()
-{
- Vector<Ref<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
-
</del><span class="cx"> static void fetchDiskCacheEntries(SessionID sessionID, std::function<void (Vector<WebsiteData::Entry>)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="lines">@@ -315,7 +297,7 @@
</span><span class="cx"> Vector<WebsiteData::Entry> entries;
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><del>- for (auto& origin : cfURLCacheOrigins())
</del><ins>+ for (auto& origin : NetworkProcess::cfURLCacheOrigins())
</ins><span class="cx"> entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeDiskCache });
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -418,12 +400,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><del>- 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());
</del><ins>+ NetworkProcess::clearCFURLCacheForOrigins(origins);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch(WTF::move(completionHandler));
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (185604 => 185605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-06-16 20:24:55 UTC (rev 185604)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-06-16 20:27:51 UTC (rev 185605)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class CertificateInfo;
</span><ins>+class SecurityOrigin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -89,6 +90,12 @@
</span><span class="cx"> void logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType, WebCore::ShouldSample);
</span><span class="cx"> void logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, WebCore::ShouldSample);
</span><span class="cx">
</span><ins>+#if USE(CFURLCACHE)
+ static Vector<Ref<WebCore::SecurityOrigin>> cfURLCacheOrigins();
+ static void clearCFURLCacheForOrigins(const Vector<SecurityOriginData>&);
+#endif
+
+
</ins><span class="cx"> private:
</span><span class="cx"> NetworkProcess();
</span><span class="cx"> ~NetworkProcess();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (185604 => 185605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-06-16 20:24:55 UTC (rev 185604)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-06-16 20:27:51 UTC (rev 185605)
</span><span class="lines">@@ -32,8 +32,11 @@
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "SandboxExtension.h"
</span><ins>+#import "SecurityOriginData.h"
</ins><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><ins>+#import <WebCore/PublicSuffix.h>
</ins><span class="cx"> #import <WebCore/ResourceRequestCFNet.h>
</span><ins>+#import <WebCore/SecurityOrigin.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/RAMSize.h>
</span><span class="cx">
</span><span class="lines">@@ -159,6 +162,56 @@
</span><span class="cx"> [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RetainPtr<CFStringRef> partitionName(CFStringRef domain)
+{
+#if ENABLE(PUBLIC_SUFFIX_LIST)
+ String highLevel = WebCore::topPrivatelyControlledDomain(domain);
+ if (highLevel.isNull())
+ return 0;
+ CString utf8String = highLevel.utf8();
+ return adoptCF(CFStringCreateWithBytes(0, reinterpret_cast<const UInt8*>(utf8String.data()), utf8String.length(), kCFStringEncodingUTF8, false));
+#else
+ return domain;
+#endif
+}
+
+Vector<Ref<WebCore::SecurityOrigin>> NetworkProcess::cfURLCacheOrigins()
+{
+ Vector<Ref<WebCore::SecurityOrigin>> result;
+
+ WKCFURLCacheCopyAllPartitionNames([&result](CFArrayRef partitionNames) {
+ RetainPtr<CFArrayRef> hostNamesInPersistentStore = adoptCF(WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFSTR("")));
+ RetainPtr<CFMutableArrayRef> hostNames = adoptCF(CFArrayCreateMutableCopy(0, 0, hostNamesInPersistentStore.get()));
+ if (partitionNames) {
+ CFArrayAppendArray(hostNames.get(), partitionNames, CFRangeMake(0, CFArrayGetCount(partitionNames)));
+ CFRelease(partitionNames);
+ }
+
+ for (CFIndex i = 0, size = CFArrayGetCount(hostNames.get()); i < size; ++i) {
+ CFStringRef host = static_cast<CFStringRef>(CFArrayGetValueAtIndex(hostNames.get(), i));
+
+ result.append(WebCore::SecurityOrigin::create("http", host, 0));
+ }
+ });
+
+ return result;
+}
+
+void NetworkProcess::clearCFURLCacheForOrigins(const Vector<SecurityOriginData>& origins)
+{
+ auto hostNames = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
+ for (auto& origin : origins)
+ CFArrayAppendValue(hostNames.get(), origin.host.createCFString().get());
+
+ WKCFURLCacheDeleteHostNamesInPersistentStore(hostNames.get());
+
+ for (CFIndex i = 0, size = CFArrayGetCount(hostNames.get()); i < size; ++i) {
+ RetainPtr<CFStringRef> partition = partitionName(static_cast<CFStringRef>(CFArrayGetValueAtIndex(hostNames.get(), i)));
+ RetainPtr<CFArrayRef> partitionHostNames = adoptCF(WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(partition.get()));
+ WKCFURLCacheDeleteHostNamesInPersistentStoreForPartition(partitionHostNames.get(), partition.get());
+ }
+}
+
</ins><span class="cx"> static void clearNSURLCache(dispatch_group_t group, std::chrono::system_clock::time_point modifiedSince, const std::function<void ()>& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
</span></span></pre>
</div>
</div>
</body>
</html>