<!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>[171575] trunk/Source/WebKit/mac</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/171575">171575</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 19:26:34 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Remove prefs to tweak cache values
https://bugs.webkit.org/show_bug.cgi?id=135274
<rdar://problem/17784826>
Reviewed by Alexey Proskuryakov.
Remove iOS specific code that used to look up user defaults to see if any cache values were
overridden. This was added for testing, is not used any more and is actually harmful now. It
can cause unnecessary memory churn when under memory pressure since we call [WebView _setCacheModel]
as a means to clear out memory cache.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences _setNSURLMemoryCacheSize:]): Deleted.
(-[WebPreferences _NSURLMemoryCacheSize]): Deleted.
(-[WebPreferences _setNSURLDiskCacheSize:]): Deleted.
(-[WebPreferences _NSURLDiskCacheSize]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(+[WebView _setCacheModel:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (171574 => 171575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-07-25 02:26:34 UTC (rev 171575)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-07-24 Pratik Solanki <psolanki@apple.com>
+
+ [iOS] Remove prefs to tweak cache values
+ https://bugs.webkit.org/show_bug.cgi?id=135274
+ <rdar://problem/17784826>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Remove iOS specific code that used to look up user defaults to see if any cache values were
+ overridden. This was added for testing, is not used any more and is actually harmful now. It
+ can cause unnecessary memory churn when under memory pressure since we call [WebView _setCacheModel]
+ as a means to clear out memory cache.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences _setNSURLMemoryCacheSize:]): Deleted.
+ (-[WebPreferences _NSURLMemoryCacheSize]): Deleted.
+ (-[WebPreferences _setNSURLDiskCacheSize:]): Deleted.
+ (-[WebPreferences _NSURLDiskCacheSize]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (+[WebView _setCacheModel:]):
+
</ins><span class="cx"> 2014-07-24 Peyton Randolph <prandolph@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename feature flag for long-press gesture on Mac.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (171574 => 171575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-07-25 02:26:34 UTC (rev 171575)
</span><span class="lines">@@ -183,8 +183,6 @@
</span><span class="cx"> #define WebKitTelephoneParsingEnabledPreferenceKey @"WebKitTelephoneParsingEnabledPreferenceKey"
</span><span class="cx"> #define WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey @"WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey"
</span><span class="cx"> #define WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey @"WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey"
</span><del>-#define WebKitNSURLMemoryCacheSizePreferenceKey @"WebKitNSURLMemoryCacheSizePreferenceKey"
-#define WebKitNSURLDiskCacheSizePreferenceKey @"WebKitNSURLDiskCacheSizePreferenceKey"
</del><span class="cx"> #define WebKitAlwaysRequestGeolocationPermissionPreferenceKey @"WebKitAlwaysRequestGeolocationPermission"
</span><span class="cx"> #define WebKitLayoutIntervalPreferenceKey @"WebKitLayoutIntervalPreferenceKey"
</span><span class="cx"> #define WebKitMaxParseDurationPreferenceKey @"WebKitMaxParseDurationPreferenceKey"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (171574 => 171575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-07-25 02:26:34 UTC (rev 171575)
</span><span class="lines">@@ -555,9 +555,6 @@
</span><span class="cx"> [NSNumber numberWithFloat:-1.0f], WebKitMaxParseDurationPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey,
</span><span class="cx"> [NSNumber numberWithInt:-1], WebKitPageCacheSizePreferenceKey,
</span><del>- [NSNumber numberWithInt:-1], WebKitObjectCacheSizePreferenceKey,
- [NSNumber numberWithInt:-1], WebKitNSURLMemoryCacheSizePreferenceKey,
- [NSNumber numberWithInt:-1], WebKitNSURLDiskCacheSizePreferenceKey,
</del><span class="cx"> [NSNumber numberWithBool:NO], WebKitAlwaysRequestGeolocationPermissionPreferenceKey,
</span><span class="cx"> [NSNumber numberWithInt:InterpolationLow], WebKitInterpolationQualityPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitPasswordEchoEnabledPreferenceKey,
</span><span class="lines">@@ -1469,26 +1466,6 @@
</span><span class="cx"> return [self _integerValueForKey:WebKitObjectCacheSizePreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setNSURLMemoryCacheSize:(int)size
-{
- [self _setIntegerValue:size forKey:WebKitNSURLMemoryCacheSizePreferenceKey];
-}
-
-- (int)_NSURLMemoryCacheSize
-{
- return [self _integerValueForKey:WebKitNSURLMemoryCacheSizePreferenceKey];
-}
-
-- (void)_setNSURLDiskCacheSize:(int)size
-{
- [self _setIntegerValue:size forKey:WebKitNSURLDiskCacheSizePreferenceKey];
-}
-
-- (int)_NSURLDiskCacheSize
-{
- return [self _integerValueForKey:WebKitNSURLDiskCacheSizePreferenceKey];
-}
-
</del><span class="cx"> - (void)_setAlwaysUseBaselineOfPrimaryFont:(BOOL)flag
</span><span class="cx"> {
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (171574 => 171575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-07-25 02:26:34 UTC (rev 171575)
</span><span class="lines">@@ -312,10 +312,6 @@
</span><span class="cx"> - (int)_pageCacheSize;
</span><span class="cx"> - (void)_setObjectCacheSize:(int)size;
</span><span class="cx"> - (int)_objectCacheSize;
</span><del>-- (void)_setNSURLMemoryCacheSize:(int)size;
-- (int)_NSURLMemoryCacheSize;
-- (void)_setNSURLDiskCacheSize:(int)size;
-- (int)_NSURLDiskCacheSize;
</del><span class="cx"> - (void)_setInterpolationQuality:(int)quality;
</span><span class="cx"> - (int)_interpolationQuality;
</span><span class="cx"> - (BOOL)_allowPasswordEcho;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (171574 => 171575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-07-25 01:31:40 UTC (rev 171574)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-07-25 02:26:34 UTC (rev 171575)
</span><span class="lines">@@ -7807,10 +7807,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case WebCacheModelPrimaryWebBrowser: {
</span><del>-#if PLATFORM(IOS)
- WebPreferences *preferences = [WebPreferences standardPreferences];
- int prefValue;
-#endif
</del><span class="cx"> // Page cache capacity (in pages)
</span><span class="cx"> // (Research indicates that value / page drops substantially after 3 pages.)
</span><span class="cx"> if (memSize >= 2048)
</span><span class="lines">@@ -7830,9 +7826,6 @@
</span><span class="cx"> // Reducing the capacity by 1 reduces overall back-forward performance.
</span><span class="cx"> if (pageCacheCapacity > 0)
</span><span class="cx"> pageCacheCapacity -= 1;
</span><del>- prefValue = [preferences _pageCacheSize];
- if (prefValue >= 0)
- pageCacheCapacity = prefValue;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Object cache capacities (in bytes)
</span><span class="lines">@@ -7848,12 +7841,6 @@
</span><span class="cx"> else if (memSize >= 512)
</span><span class="cx"> cacheTotalCapacity = 32 * 1024 * 1024;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- prefValue = [preferences _objectCacheSize];
- if (prefValue >= 0)
- cacheTotalCapacity = prefValue;
-#endif
-
</del><span class="cx"> cacheMinDeadCapacity = cacheTotalCapacity / 4;
</span><span class="cx"> cacheMaxDeadCapacity = cacheTotalCapacity / 2;
</span><span class="cx">
</span><span class="lines">@@ -7868,10 +7855,6 @@
</span><span class="cx"> nsurlCacheMemoryCapacity = 16 * 1024 * 1024;
</span><span class="cx"> else
</span><span class="cx"> nsurlCacheMemoryCapacity = 8 * 1024 * 1024;
</span><del>-
- prefValue = [preferences _NSURLMemoryCacheSize];
- if (prefValue >= 0)
- nsurlCacheMemoryCapacity = prefValue;
</del><span class="cx"> #else
</span><span class="cx"> // Foundation memory cache capacity (in bytes)
</span><span class="cx"> // (These values are small because WebCore does most caching itself.)
</span><span class="lines">@@ -7900,10 +7883,6 @@
</span><span class="cx"> nsurlCacheDiskCapacity = 50 * 1024 * 1024;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- prefValue = [preferences _NSURLDiskCacheSize];
- if (prefValue >= 0)
- nsurlCacheDiskCapacity = prefValue;
-
</del><span class="cx"> // TileCache layer pool capacity, in bytes.
</span><span class="cx"> if (memSize >= 1024)
</span><span class="cx"> tileLayerPoolCapacity = 48 * 1024 * 1024;
</span></span></pre>
</div>
</div>
</body>
</html>