<!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>[182031] 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/182031">182031</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 15:52:14 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][Cocoa] Add private API to override the network disk cache size
https://bugs.webkit.org/show_bug.cgi?id=143113
<rdar://problem/20315669>
Reviewed by Antti Koivisto.
Add private API to let the client override the network disk cache size.
By default, the network disk cache is automatically determined based on
the CacheModel and the available disk space. However, for testing
purposes, it can be used for the client-side to be able to override
the disk cache size.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::setMaximumSize):
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformSetCacheModel):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
(-[_WKProcessPoolConfiguration diskCacheSizeOverride]):
(-[_WKProcessPoolConfiguration setDiskCacheSizeOverride:]):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::WebProcessPool):
(WebKit::WebProcessPool::ensureNetworkProcess):
* UIProcess/WebProcessPool.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="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-03-26 Chris Dumez <cdumez@apple.com>
+
+ [WK2][Cocoa] Add private API to override the network disk cache size
+ https://bugs.webkit.org/show_bug.cgi?id=143113
+ <rdar://problem/20315669>
+
+ Reviewed by Antti Koivisto.
+
+ Add private API to let the client override the network disk cache size.
+ By default, the network disk cache is automatically determined based on
+ the CacheModel and the available disk space. However, for testing
+ purposes, it can be used for the client-side to be able to override
+ the disk cache size.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::setMaximumSize):
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformSetCacheModel):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration diskCacheSizeOverride]):
+ (-[_WKProcessPoolConfiguration setDiskCacheSizeOverride:]):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::WebProcessPool):
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2015-03-26 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [Darwin] Boost the web process QoS level while handling a synchronous IPC message.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -177,6 +177,8 @@
</span><span class="cx"> memoryPressureHandler.install();
</span><span class="cx">
</span><span class="cx"> m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
</span><ins>+
+ m_diskCacheSizeOverride = parameters.diskCacheSizeOverride;
</ins><span class="cx"> setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
</span><span class="cx">
</span><span class="cx"> setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx"> String m_diskCacheDirectory;
</span><span class="cx"> bool m_hasSetCacheModel;
</span><span class="cx"> CacheModel m_cacheModel;
</span><ins>+ int64_t m_diskCacheSizeOverride { -1 };
</ins><span class="cx"> bool m_diskCacheIsDisabledForTesting;
</span><span class="cx"> bool m_canHandleHTTPSServerTrustEvaluation;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -133,6 +133,9 @@
</span><span class="cx"> cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
</span><span class="cx"> pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity);
</span><span class="cx">
</span><ins>+ if (m_diskCacheSizeOverride >= 0)
+ urlCacheDiskCapacity = m_diskCacheSizeOverride;
+
</ins><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> auto& networkCache = NetworkCache::singleton();
</span><span class="cx"> if (networkCache.isEnabled()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << privateBrowsingEnabled;
</span><span class="cx"> encoder.encodeEnum(cacheModel);
</span><ins>+ encoder << diskCacheSizeOverride;
</ins><span class="cx"> encoder << canHandleHTTPSServerTrustEvaluation;
</span><span class="cx"> encoder << diskCacheDirectory;
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><span class="lines">@@ -78,6 +79,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decodeEnum(result.cacheModel))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.diskCacheSizeOverride))
+ return false;
</ins><span class="cx"> if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.diskCacheDirectory))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> bool privateBrowsingEnabled;
</span><span class="cx"> CacheModel cacheModel;
</span><ins>+ int64_t diskCacheSizeOverride { -1 };
</ins><span class="cx"> bool canHandleHTTPSServerTrustEvaluation;
</span><span class="cx">
</span><span class="cx"> String diskCacheDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> copy->m_useNetworkProcess = this->m_useNetworkProcess;
</span><span class="cx"> copy->m_maximumProcessCount = this->m_maximumProcessCount;
</span><span class="cx"> copy->m_cacheModel = this->m_cacheModel;
</span><ins>+ copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
</ins><span class="cx"> copy->m_indexedDBDatabaseDirectory = this->m_indexedDBDatabaseDirectory;
</span><span class="cx"> copy->m_injectedBundlePath = this->m_injectedBundlePath;
</span><span class="cx"> copy->m_localStorageDirectory = this->m_localStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -55,8 +55,11 @@
</span><span class="cx"> void setMaximumProcessCount(unsigned maximumProcessCount) { m_maximumProcessCount = maximumProcessCount; }
</span><span class="cx">
</span><span class="cx"> WebKit::CacheModel cacheModel() const { return m_cacheModel; }
</span><del>- void setCacheModel(WebKit::CacheModel cacheModel) { m_cacheModel = cacheModel; }
</del><ins>+ void setCacheModel(WebKit::CacheModel cacheModel) { m_cacheModel = cacheModel; }
</ins><span class="cx">
</span><ins>+ int64_t diskCacheSizeOverride() const { return m_diskCacheSizeOverride; }
+ void setDiskCacheSizeOverride(int64_t size) { m_diskCacheSizeOverride = size; }
+
</ins><span class="cx"> WTF::String indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
</span><span class="cx"> void setIndexedDBDatabaseDirectory(const WTF::String& indexedDBDatabaseDirectory) { m_indexedDBDatabaseDirectory = indexedDBDatabaseDirectory; }
</span><span class="cx">
</span><span class="lines">@@ -80,6 +83,7 @@
</span><span class="cx"> bool m_useNetworkProcess { true };
</span><span class="cx"> unsigned m_maximumProcessCount { 0 };
</span><span class="cx"> WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
</span><ins>+ int64_t m_diskCacheSizeOverride { -1 };
</ins><span class="cx"> WTF::String m_injectedBundlePath;
</span><span class="cx"> WTF::String m_indexedDBDatabaseDirectory;
</span><span class="cx"> WTF::String m_localStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, copy) NSURL *injectedBundleURL;
</span><span class="cx"> @property (nonatomic) NSUInteger maximumProcessCount;
</span><ins>+@property (nonatomic) NSInteger diskCacheSizeOverride WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> @property (nonatomic, copy) NSArray *cachePartitionedURLSchemes;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -72,6 +72,16 @@
</span><span class="cx"> _processPoolConfiguration->setMaximumProcessCount(maximumProcessCount);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSInteger)diskCacheSizeOverride
+{
+ return _processPoolConfiguration->diskCacheSizeOverride();
+}
+
+- (void)setDiskCacheSizeOverride:(NSInteger)size
+{
+ _processPoolConfiguration->setDiskCacheSizeOverride(size);
+}
+
</ins><span class="cx"> - (NSArray *)cachePartitionedURLSchemes
</span><span class="cx"> {
</span><span class="cx"> auto schemes = _processPoolConfiguration->cachePartitionedURLSchemes();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> , m_alwaysUsesComplexTextCodePath(false)
</span><span class="cx"> , m_shouldUseFontSmoothing(true)
</span><span class="cx"> , m_cacheModel(m_configuration->cacheModel())
</span><ins>+ , m_diskCacheSizeOverride(m_configuration->diskCacheSizeOverride())
</ins><span class="cx"> , m_memorySamplerEnabled(false)
</span><span class="cx"> , m_memorySamplerInterval(1400.0)
</span><span class="cx"> , m_websiteDataStore(API::WebsiteDataStore::create(websiteDataStoreConfiguration(m_configuration.get())))
</span><span class="lines">@@ -403,6 +404,7 @@
</span><span class="cx"> parameters.privateBrowsingEnabled = WebPreferences::anyPagesAreUsingPrivateBrowsing();
</span><span class="cx">
</span><span class="cx"> parameters.cacheModel = m_cacheModel;
</span><ins>+ parameters.diskCacheSizeOverride = m_diskCacheSizeOverride;
</ins><span class="cx"> parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
</span><span class="cx">
</span><span class="cx"> parameters.diskCacheDirectory = stringByResolvingSymlinksInPath(diskCacheDirectory());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (182030 => 182031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-03-26 22:35:30 UTC (rev 182030)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-03-26 22:52:14 UTC (rev 182031)
</span><span class="lines">@@ -475,6 +475,7 @@
</span><span class="cx"> Vector<std::pair<String, RefPtr<API::Object>>> m_messagesToInjectedBundlePostedToEmptyContext;
</span><span class="cx">
</span><span class="cx"> CacheModel m_cacheModel;
</span><ins>+ uint64_t m_diskCacheSizeOverride;
</ins><span class="cx">
</span><span class="cx"> bool m_memorySamplerEnabled;
</span><span class="cx"> double m_memorySamplerInterval;
</span></span></pre>
</div>
</div>
</body>
</html>