Back out 52702d275995 (bug 647391) because of xpcshell test failures
authorMatt Brubeck <mbrubeck@mozilla.com>
Tue, 02 Aug 2011 19:59:22 -0700
changeset 73700 29232fea6e191c93c10e17d838faf616146b1b8c
parent 73699 e966ad69a36403c9c3bd99eecb015f9033521e6c
child 73701 ba5eb1cd42f3881788740a4e5464c3547944e818
push id932
push usermbrubeck@mozilla.com
push dateWed, 03 Aug 2011 03:00:28 +0000
treeherdermozilla-inbound@29232fea6e19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs647391
milestone8.0a1
backs out52702d275995f508a0044f18b09f20f717afc23d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 52702d275995 (bug 647391) because of xpcshell test failures
modules/libpref/src/init/all.js
netwerk/cache/nsCacheService.h
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -59,26 +59,26 @@ pref("general.warnOnAboutConfig", true);
 // maximum number of dated backups to keep at any time
 pref("browser.bookmarks.max_backups",       5);
 
 pref("browser.cache.disk.enable",           true);
 // Is this the first-time smartsizing has been introduced?
 pref("browser.cache.disk.smart_size.first_run", true);
 // Does the user want smart-sizing?
 pref("browser.cache.disk.smart_size.enabled", true);
-// Size (in KB) explicitly set by the user. Used when smart_size.enabled == false
+// Size explicitly set by the user. Used when smart_size.enabled == false
 pref("browser.cache.disk.capacity",         256000);
-// Max-size (in KB) for entries in disk cache. Set to -1 for no limit.
-// (Note: entries bigger than 1/8 of disk-cache are never cached)
-pref("browser.cache.disk.max_entry_size",    51200);  // 50 MB
+// User-controllable max-size for entries in disk-cache. Regardless of this
+// setting, no entries bigger than 1/8 of disk-cache will be cached
+pref("browser.cache.disk.max_entry_size",    5120);
 pref("browser.cache.memory.enable",         true);
 // -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes
 //pref("browser.cache.memory.capacity",     -1);
-// Max-size (in KB) for entries in memory cache. Set to -1 for no limit.  
-// (Note: entries bigger than than 90% of the mem-cache are never cached)
+// User-controllable max-size for entries in mem-cache. Regardless of this
+// setting, no entries bigger than 90% of the mem-cache will be cached
 pref("browser.cache.memory.max_entry_size",  5120);
 pref("browser.cache.disk_cache_ssl",        true);
 // 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically
 pref("browser.cache.check_doc_frequency",   3);
 
 pref("browser.cache.offline.enable",           true);
 
 // offline cache capacity in kilobytes
--- a/netwerk/cache/nsCacheService.h
+++ b/netwerk/cache/nsCacheService.h
@@ -159,21 +159,19 @@ public:
      * Methods called by nsCacheProfilePrefObserver
      */
     static void      OnProfileShutdown(PRBool cleanse);
     static void      OnProfileChanged();
 
     static void      SetDiskCacheEnabled(PRBool  enabled);
     // Sets the disk cache capacity (in kilobytes)
     static void      SetDiskCacheCapacity(PRInt32  capacity);
-    // Set max size for a disk-cache entry (in KB). -1 disables limit up to
-    // 1/8th of disk cache size
+    // Set max size for a disk-cache entry (in bytes). -1 disables this limit
     static void      SetDiskCacheMaxEntrySize(PRInt32  maxSize);
-    // Set max size for a memory-cache entry (in kilobytes). -1 disables
-    // limit up to 90% of memory cache size
+    // Set max size for a memory-cache entry (in bytes). -1 disables this limit
     static void      SetMemoryCacheMaxEntrySize(PRInt32  maxSize);
 
     static void      SetOfflineCacheEnabled(PRBool  enabled);
     // Sets the offline cache capacity (in kilobytes)
     static void      SetOfflineCacheCapacity(PRInt32  capacity);
 
     static void      SetMemoryCache();