- Revision
- 171575
- Author
- [email protected]
- Date
- 2014-07-24 19:26:34 -0700 (Thu, 24 Jul 2014)
Log Message
[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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (171574 => 171575)
--- 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)
@@ -1,3 +1,27 @@
+2014-07-24 Pratik Solanki <[email protected]>
+
+ [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:]):
+
2014-07-24 Peyton Randolph <[email protected]>
Rename feature flag for long-press gesture on Mac.
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (171574 => 171575)
--- 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)
@@ -183,8 +183,6 @@
#define WebKitTelephoneParsingEnabledPreferenceKey @"WebKitTelephoneParsingEnabledPreferenceKey"
#define WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey @"WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey"
#define WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey @"WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey"
-#define WebKitNSURLMemoryCacheSizePreferenceKey @"WebKitNSURLMemoryCacheSizePreferenceKey"
-#define WebKitNSURLDiskCacheSizePreferenceKey @"WebKitNSURLDiskCacheSizePreferenceKey"
#define WebKitAlwaysRequestGeolocationPermissionPreferenceKey @"WebKitAlwaysRequestGeolocationPermission"
#define WebKitLayoutIntervalPreferenceKey @"WebKitLayoutIntervalPreferenceKey"
#define WebKitMaxParseDurationPreferenceKey @"WebKitMaxParseDurationPreferenceKey"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (171574 => 171575)
--- 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)
@@ -555,9 +555,6 @@
[NSNumber numberWithFloat:-1.0f], WebKitMaxParseDurationPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey,
[NSNumber numberWithInt:-1], WebKitPageCacheSizePreferenceKey,
- [NSNumber numberWithInt:-1], WebKitObjectCacheSizePreferenceKey,
- [NSNumber numberWithInt:-1], WebKitNSURLMemoryCacheSizePreferenceKey,
- [NSNumber numberWithInt:-1], WebKitNSURLDiskCacheSizePreferenceKey,
[NSNumber numberWithBool:NO], WebKitAlwaysRequestGeolocationPermissionPreferenceKey,
[NSNumber numberWithInt:InterpolationLow], WebKitInterpolationQualityPreferenceKey,
[NSNumber numberWithBool:YES], WebKitPasswordEchoEnabledPreferenceKey,
@@ -1469,26 +1466,6 @@
return [self _integerValueForKey:WebKitObjectCacheSizePreferenceKey];
}
-- (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];
-}
-
- (void)_setAlwaysUseBaselineOfPrimaryFont:(BOOL)flag
{
[self _setBoolValue:flag forKey:WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (171574 => 171575)
--- 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)
@@ -312,10 +312,6 @@
- (int)_pageCacheSize;
- (void)_setObjectCacheSize:(int)size;
- (int)_objectCacheSize;
-- (void)_setNSURLMemoryCacheSize:(int)size;
-- (int)_NSURLMemoryCacheSize;
-- (void)_setNSURLDiskCacheSize:(int)size;
-- (int)_NSURLDiskCacheSize;
- (void)_setInterpolationQuality:(int)quality;
- (int)_interpolationQuality;
- (BOOL)_allowPasswordEcho;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (171574 => 171575)
--- 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)
@@ -7807,10 +7807,6 @@
break;
}
case WebCacheModelPrimaryWebBrowser: {
-#if PLATFORM(IOS)
- WebPreferences *preferences = [WebPreferences standardPreferences];
- int prefValue;
-#endif
// Page cache capacity (in pages)
// (Research indicates that value / page drops substantially after 3 pages.)
if (memSize >= 2048)
@@ -7830,9 +7826,6 @@
// Reducing the capacity by 1 reduces overall back-forward performance.
if (pageCacheCapacity > 0)
pageCacheCapacity -= 1;
- prefValue = [preferences _pageCacheSize];
- if (prefValue >= 0)
- pageCacheCapacity = prefValue;
#endif
// Object cache capacities (in bytes)
@@ -7848,12 +7841,6 @@
else if (memSize >= 512)
cacheTotalCapacity = 32 * 1024 * 1024;
-#if PLATFORM(IOS)
- prefValue = [preferences _objectCacheSize];
- if (prefValue >= 0)
- cacheTotalCapacity = prefValue;
-#endif
-
cacheMinDeadCapacity = cacheTotalCapacity / 4;
cacheMaxDeadCapacity = cacheTotalCapacity / 2;
@@ -7868,10 +7855,6 @@
nsurlCacheMemoryCapacity = 16 * 1024 * 1024;
else
nsurlCacheMemoryCapacity = 8 * 1024 * 1024;
-
- prefValue = [preferences _NSURLMemoryCacheSize];
- if (prefValue >= 0)
- nsurlCacheMemoryCapacity = prefValue;
#else
// Foundation memory cache capacity (in bytes)
// (These values are small because WebCore does most caching itself.)
@@ -7900,10 +7883,6 @@
nsurlCacheDiskCapacity = 50 * 1024 * 1024;
#if PLATFORM(IOS)
- prefValue = [preferences _NSURLDiskCacheSize];
- if (prefValue >= 0)
- nsurlCacheDiskCapacity = prefValue;
-
// TileCache layer pool capacity, in bytes.
if (memSize >= 1024)
tileLayerPoolCapacity = 48 * 1024 * 1024;
