<!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>[185251] 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/185251">185251</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 10:19:37 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable the CFNetwork cache in the web process
https://bugs.webkit.org/show_bug.cgi?id=145700
rdar://problem/20243343
Reviewed by Geoffrey Garen.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::open):
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters): Deleted.
(WebKit::WebProcessCreationParameters::encode): Deleted.
(WebKit::WebProcessCreationParameters::decode): Deleted.
* Shared/WebProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess): Deleted.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess): Deleted.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess): Deleted.
(WebKit::WebProcess::initializeWebProcess): Deleted.
* WebProcess/WebProcess.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformClearResourceCaches):
(WebKit::WebProcess::platformInitializeWebProcess):
(WebKit::WebProcess::platformSetCacheModel): Deleted.
(WebKit::WebProcess::platformTerminate): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-06-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Disable the CFNetwork cache in the web process
+ https://bugs.webkit.org/show_bug.cgi?id=145700
+ rdar://problem/20243343
+
+ Reviewed by Geoffrey Garen.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::open):
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters): Deleted.
+ (WebKit::WebProcessCreationParameters::encode): Deleted.
+ (WebKit::WebProcessCreationParameters::decode): Deleted.
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess): Deleted.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess): Deleted.
+ (WebKit::WebProcess::initializeWebProcess): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformClearResourceCaches):
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ (WebKit::WebProcess::platformSetCacheModel): Deleted.
+ (WebKit::WebProcess::platformTerminate): Deleted.
+
+2015-06-05 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Consolidate default website data directory computations
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145698
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="cx"> String networkCachePath = WebCore::pathByAppendingComponent(cachePath, networkCacheSubdirectory);
</span><ins>+
</ins><span class="cx"> if (!WebCore::makeAllDirectories(networkCachePath))
</span><span class="cx"> return nullptr;
</span><span class="cx"> return std::unique_ptr<Storage>(new Storage(networkCachePath));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -40,8 +40,6 @@
</span><span class="cx"> , shouldUseFontSmoothing(true)
</span><span class="cx"> , defaultRequestTimeoutInterval(INT_MAX)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- , nsURLCacheMemoryCapacity(0)
- , nsURLCacheDiskCapacity(0)
</del><span class="cx"> , shouldEnableKerningAndLigaturesByDefault(false)
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><span class="lines">@@ -71,8 +69,6 @@
</span><span class="cx"> encoder << applicationCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << webSQLDatabaseDirectory;
</span><span class="cx"> encoder << webSQLDatabaseDirectoryExtensionHandle;
</span><del>- encoder << diskCacheDirectory;
- encoder << diskCacheDirectoryExtensionHandle;
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><span class="cx"> #endif
</span><span class="lines">@@ -122,8 +118,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> encoder << presenterApplicationPid;
</span><span class="cx"> encoder << accessibilityEnhancedUserInterfaceEnabled;
</span><del>- encoder << nsURLCacheMemoryCapacity;
- encoder << nsURLCacheDiskCapacity;
</del><span class="cx"> encoder << acceleratedCompositingPort;
</span><span class="cx"> encoder << uiProcessBundleResourcePath;
</span><span class="cx"> encoder << uiProcessBundleResourcePathExtensionHandle;
</span><span class="lines">@@ -178,10 +172,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.webSQLDatabaseDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.diskCacheDirectory))
- return false;
- if (!decoder.decode(parameters.diskCacheDirectoryExtensionHandle))
- return false;
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> if (!decoder.decode(parameters.cookieStorageDirectory))
</span><span class="cx"> return false;
</span><span class="lines">@@ -268,10 +258,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.accessibilityEnhancedUserInterfaceEnabled))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.nsURLCacheMemoryCapacity))
- return false;
- if (!decoder.decode(parameters.nsURLCacheDiskCapacity))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.acceleratedCompositingPort))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.uiProcessBundleResourcePath))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
</span><span class="cx"> String webSQLDatabaseDirectory;
</span><span class="cx"> SandboxExtension::Handle webSQLDatabaseDirectoryExtensionHandle;
</span><del>- String diskCacheDirectory;
- SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> String cookieStorageDirectory;
</span><span class="cx"> #endif
</span><span class="lines">@@ -138,9 +136,6 @@
</span><span class="cx">
</span><span class="cx"> bool accessibilityEnhancedUserInterfaceEnabled;
</span><span class="cx">
</span><del>- uint64_t nsURLCacheMemoryCapacity;
- uint64_t nsURLCacheDiskCapacity;
-
</del><span class="cx"> WebCore::MachSendRight acceleratedCompositingPort;
</span><span class="cx">
</span><span class="cx"> String uiProcessBundleResourcePath;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -174,10 +174,6 @@
</span><span class="cx"> parameters.accessibilityEnhancedUserInterfaceEnabled = false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- NSURLCache *urlCache = [NSURLCache sharedURLCache];
- parameters.nsURLCacheMemoryCapacity = [urlCache memoryCapacity];
- parameters.nsURLCacheDiskCapacity = [urlCache diskCapacity];
-
</del><span class="cx"> parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
</span><span class="cx"> parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx"> parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -617,10 +617,6 @@
</span><span class="cx"> if (!parameters.webSQLDatabaseDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.webSQLDatabaseDirectory, parameters.webSQLDatabaseDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- parameters.diskCacheDirectory = diskCacheDirectory();
- if (!parameters.diskCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
-
</del><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="cx"> parameters.cookieStorageDirectory = this->cookieStorageDirectory();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -157,10 +157,6 @@
</span><span class="cx"> , m_inDidClose(false)
</span><span class="cx"> , m_hasSetCacheModel(false)
</span><span class="cx"> , m_cacheModel(CacheModelDocumentViewer)
</span><del>- , m_diskCacheIsDisabledForTesting(false)
-#if PLATFORM(COCOA)
- , m_clearResourceCachesDispatchGroup(0)
-#endif
</del><span class="cx"> , m_fullKeyboardAccessEnabled(false)
</span><span class="cx"> , m_textCheckerState()
</span><span class="cx"> , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
</span><span class="lines">@@ -300,7 +296,6 @@
</span><span class="cx"> if (!parameters.applicationCacheDirectory.isEmpty())
</span><span class="cx"> ApplicationCacheStorage::singleton().setCacheDirectory(parameters.applicationCacheDirectory);
</span><span class="cx">
</span><del>- m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
</del><span class="cx"> setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
</span><span class="cx">
</span><span class="cx"> if (!parameters.languages.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -338,12 +338,10 @@
</span><span class="cx">
</span><span class="cx"> bool m_hasSetCacheModel;
</span><span class="cx"> CacheModel m_cacheModel;
</span><del>- bool m_diskCacheIsDisabledForTesting;
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WebCore::MachSendRight m_compositingRenderServerPort;
</span><span class="cx"> pid_t m_presenterApplicationPid;
</span><del>- dispatch_group_t m_clearResourceCachesDispatchGroup;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_fullKeyboardAccessEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (185250 => 185251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-06-05 17:17:30 UTC (rev 185250)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-06-05 17:19:37 UTC (rev 185251)
</span><span class="lines">@@ -98,29 +98,11 @@
</span><span class="cx"> memoryCache.setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
</span><span class="cx"> memoryCache.setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><span class="cx"> PageCache::singleton().setMaxSize(pageCacheSize);
</span><del>-
- NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
-
- [nsurlCache setMemoryCapacity:urlCacheMemoryCapacity];
- if (!m_diskCacheIsDisabledForTesting)
- [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear)
</span><span class="cx"> {
</span><del>- if (cachesToClear == InMemoryResourceCachesOnly)
- return;
-
- // If we're using the network process then it is the only one that needs to clear the disk cache.
- if (usesNetworkProcess())
- return;
-
- if (!m_clearResourceCachesDispatchGroup)
- m_clearResourceCachesDispatchGroup = dispatch_group_create();
-
- dispatch_group_async(m_clearResourceCachesDispatchGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
- [[NSURLCache sharedURLCache] removeAllCachedResponses];
- });
</del><ins>+ // FIXME: Remove this.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="lines">@@ -140,7 +122,6 @@
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</del><span class="cx"> SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="lines">@@ -153,29 +134,9 @@
</span><span class="cx"> setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
- // - memory cache size passed from UI process is always ignored;
- // - disk cache size passed from UI process is effectively a minimum size.
- // One non-obvious constraint is that we need to use -setSharedURLCache: even in testing mode, to prevent creating a default one on disk later, when some other code touches the cache.
</del><ins>+ auto urlCache = adoptNS([[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil]);
+ [NSURLCache setSharedURLCache:urlCache.get()];
</ins><span class="cx">
</span><del>- ASSERT(!m_diskCacheIsDisabledForTesting || !parameters.nsURLCacheDiskCapacity);
-
-#if PLATFORM(IOS)
- if (!parameters.uiProcessBundleIdentifier.isNull()) {
- [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
- _initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
- diskCapacity:parameters.nsURLCacheDiskCapacity
- relativePath:parameters.uiProcessBundleIdentifier]).get()];
- }
-#else
- if (!parameters.diskCacheDirectory.isNull()) {
- [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
- initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
- diskCapacity:parameters.nsURLCacheDiskCapacity
- diskPath:parameters.diskCacheDirectory]).get()];
- }
-#endif
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> WebCore::FontCache::setFontWhitelist(parameters.fontWhitelist);
</span><span class="cx"> #endif
</span><span class="lines">@@ -231,11 +192,6 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::platformTerminate()
</span><span class="cx"> {
</span><del>- if (m_clearResourceCachesDispatchGroup) {
- dispatch_group_wait(m_clearResourceCachesDispatchGroup, DISPATCH_TIME_FOREVER);
- dispatch_release(m_clearResourceCachesDispatchGroup);
- m_clearResourceCachesDispatchGroup = 0;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
</span></span></pre>
</div>
</div>
</body>
</html>