<!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>[180838] 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/180838">180838</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-28 12:20:31 -0800 (Sat, 28 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify WebResourceCacheManagerCFNet.mm code
https://bugs.webkit.org/show_bug.cgi?id=142134
Reviewed by Dan Bernstein.
- ENABLE(CACHE_PARTITIONING) is always true on Mac and iOS, so remove those #ifdefs.
- Make cfURLCacheHostNamesWithCallback and clearCFURLCacheForHostNames public
so they can be used by the new WebsiteDataStore code in an upcoming patch.
- Change cfURLCacheHostNamesWithCallback to take an std::function instead of a block.
* WebProcess/ResourceCache/WebResourceCacheManager.cpp:
(WebKit::WebResourceCacheManager::getCacheOrigins):
* WebProcess/ResourceCache/WebResourceCacheManager.h:
* WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm:
(WebKit::partitionName):
(WebKit::WebResourceCacheManager::cfURLCacheHostNamesWithCallback):
(WebKit::WebResourceCacheManager::clearCFURLCacheForHostNames):
(WebKit::WebResourceCacheManager::cfURLCacheHostNames): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessResourceCacheWebResourceCacheManagercpp">trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessResourceCacheWebResourceCacheManagerh">trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessResourceCachecfWebResourceCacheManagerCFNetmm">trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180837 => 180838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-02-28 18:45:42 UTC (rev 180837)
+++ trunk/Source/WebKit2/ChangeLog        2015-02-28 20:20:31 UTC (rev 180838)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-28 Anders Carlsson <andersca@apple.com>
+
+ Simplify WebResourceCacheManagerCFNet.mm code
+ https://bugs.webkit.org/show_bug.cgi?id=142134
+
+ Reviewed by Dan Bernstein.
+
+ - ENABLE(CACHE_PARTITIONING) is always true on Mac and iOS, so remove those #ifdefs.
+ - Make cfURLCacheHostNamesWithCallback and clearCFURLCacheForHostNames public
+ so they can be used by the new WebsiteDataStore code in an upcoming patch.
+ - Change cfURLCacheHostNamesWithCallback to take an std::function instead of a block.
+
+ * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
+ (WebKit::WebResourceCacheManager::getCacheOrigins):
+ * WebProcess/ResourceCache/WebResourceCacheManager.h:
+ * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm:
+ (WebKit::partitionName):
+ (WebKit::WebResourceCacheManager::cfURLCacheHostNamesWithCallback):
+ (WebKit::WebResourceCacheManager::clearCFURLCacheForHostNames):
+ (WebKit::WebResourceCacheManager::cfURLCacheHostNames): Deleted.
+
</ins><span class="cx"> 2015-02-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r180804.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessResourceCacheWebResourceCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp (180837 => 180838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp        2015-02-28 18:45:42 UTC (rev 180837)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp        2015-02-28 20:20:31 UTC (rev 180838)
</span><span class="lines">@@ -52,19 +52,12 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceCacheManager::getCacheOrigins(uint64_t callbackID) const
</span><span class="cx"> {
</span><del>-#if USE(CFURLCACHE) && ENABLE(CACHE_PARTITIONING)
- __block MemoryCache::SecurityOriginSet origins;
-#else
</del><span class="cx"> MemoryCache::SecurityOriginSet origins;
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> MemoryCache::singleton().getOriginsWithCache(origins);
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><del>-#if ENABLE(CACHE_PARTITIONING)
- cfURLCacheHostNamesWithCallback(^(RetainPtr<CFArrayRef> cfURLHosts) {
-#else
- RetainPtr<CFArrayRef> cfURLHosts = cfURLCacheHostNames();
-#endif
</del><ins>+ cfURLCacheHostNamesWithCallback([&origins](RetainPtr<CFArrayRef> cfURLHosts) {
</ins><span class="cx"> CFIndex size = cfURLHosts ? CFArrayGetCount(cfURLHosts.get()) : 0;
</span><span class="cx">
</span><span class="cx"> String httpString("http");
</span><span class="lines">@@ -72,13 +65,10 @@
</span><span class="cx"> CFStringRef host = static_cast<CFStringRef>(CFArrayGetValueAtIndex(cfURLHosts.get(), i));
</span><span class="cx"> origins.add(SecurityOrigin::create(httpString, host, 0));
</span><span class="cx"> }
</span><del>-#endif
-
- returnCacheOrigins(callbackID, origins);
-
-#if USE(CFURLCACHE) && ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> });
</span><span class="cx"> #endif
</span><ins>+
+ returnCacheOrigins(callbackID, origins);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceCacheManager::returnCacheOrigins(uint64_t callbackID, const MemoryCache::SecurityOriginSet& origins) const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessResourceCacheWebResourceCacheManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h (180837 => 180838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h        2015-02-28 18:45:42 UTC (rev 180837)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h        2015-02-28 20:20:31 UTC (rev 180838)
</span><span class="lines">@@ -46,6 +46,11 @@
</span><span class="cx">
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span><ins>+#if USE(CFURLCACHE)
+ static void cfURLCacheHostNamesWithCallback(std::function<void (RetainPtr<CFArrayRef>)>);
+ static void clearCFURLCacheForHostNames(CFArrayRef);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> // Implemented in generated WebResourceCacheManagerMessageReceiver.cpp
</span><span class="lines">@@ -56,15 +61,6 @@
</span><span class="cx"> void clearCacheForOrigin(const SecurityOriginData&, uint32_t cachesToClear) const;
</span><span class="cx"> void clearCacheForAllOrigins(uint32_t cachesToClear) const;
</span><span class="cx">
</span><del>-#if USE(CFURLCACHE)
- static RetainPtr<CFArrayRef> cfURLCacheHostNames();
-#if ENABLE(CACHE_PARTITIONING)
- typedef void (^CacheCallback)(RetainPtr<CFArrayRef>);
- static void cfURLCacheHostNamesWithCallback(CacheCallback);
-#endif
- static void clearCFURLCacheForHostNames(CFArrayRef);
-#endif
-
</del><span class="cx"> WebProcess* m_process;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessResourceCachecfWebResourceCacheManagerCFNetmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm (180837 => 180838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm        2015-02-28 18:45:42 UTC (rev 180837)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm        2015-02-28 20:20:31 UTC (rev 180838)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
-#include "WebResourceCacheManager.h"
</del><ins>+#import "config.h"
+#import "WebResourceCacheManager.h"
</ins><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><span class="cx">
</span><span class="lines">@@ -33,14 +33,10 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-#include "WebKitSystemInterface.h"
-#endif
</del><ins>+#import "WebKitSystemInterface.h"
</ins><span class="cx">
</span><del>-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> static RetainPtr<CFStringRef> partitionName(CFStringRef domain)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(PUBLIC_SUFFIX_LIST)
</span><span class="lines">@@ -53,16 +49,9 @@
</span><span class="cx"> return domain;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-RetainPtr<CFArrayRef> WebResourceCacheManager::cfURLCacheHostNames()
</del><ins>+void WebResourceCacheManager::cfURLCacheHostNamesWithCallback(std::function<void (RetainPtr<CFArrayRef>)> callback)
</ins><span class="cx"> {
</span><del>- return adoptCF(WKCFURLCacheCopyAllHostNamesInPersistentStore());
-}
-
-#if ENABLE(CACHE_PARTITIONING)
-void WebResourceCacheManager::cfURLCacheHostNamesWithCallback(CacheCallback callback)
-{
</del><span class="cx"> WKCFURLCacheCopyAllPartitionNames(^(CFArrayRef partitionNames) {
</span><span class="cx"> RetainPtr<CFArrayRef> hostNamesInPersistentStore = adoptCF(WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFSTR("")));
</span><span class="cx"> RetainPtr<CFMutableArrayRef> hostNames = adoptCF(CFArrayCreateMutableCopy(0, 0, hostNamesInPersistentStore.get()));
</span><span class="lines">@@ -73,20 +62,17 @@
</span><span class="cx"> callback(WTF::move(hostNames));
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebResourceCacheManager::clearCFURLCacheForHostNames(CFArrayRef hostNames)
</span><span class="cx"> {
</span><span class="cx"> WKCFURLCacheDeleteHostNamesInPersistentStore(hostNames);
</span><span class="cx">
</span><del>-#if ENABLE(CACHE_PARTITIONING)
</del><span class="cx"> CFIndex size = CFArrayGetCount(hostNames);
</span><span class="cx"> for (CFIndex i = 0; i < size; ++i) {
</span><span class="cx"> RetainPtr<CFStringRef> partition = partitionName(static_cast<CFStringRef>(CFArrayGetValueAtIndex(hostNames, i)));
</span><span class="cx"> RetainPtr<CFArrayRef> partitionHostNames = adoptCF(WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(partition.get()));
</span><span class="cx"> WKCFURLCacheDeleteHostNamesInPersistentStoreForPartition(partitionHostNames.get(), partition.get());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>