mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 14:52:16 +00:00
Fix bug 110405. Removing anachronistic assertion, added condition to respect STORE_ON_DISK policy. Changed fav icon cache policy to STORE_ANYWHERE. r/sr = darin, hyatt, sfraser.
This commit is contained in:
parent
190a0000f7
commit
8b769b6c5b
4
netwerk/cache/src/nsCacheService.cpp
vendored
4
netwerk/cache/src/nsCacheService.cpp
vendored
@ -935,9 +935,7 @@ nsCacheService::EnsureEntryHasDevice(nsCacheEntry * entry)
|
||||
}
|
||||
|
||||
// if we can't use mDiskDevice, try mMemoryDevice
|
||||
if (!device && mEnableMemoryDevice) {
|
||||
NS_ASSERTION(entry->IsAllowedInMemory(), "oops.. bad flags");
|
||||
|
||||
if (!device && mEnableMemoryDevice && entry->IsAllowedInMemory()) {
|
||||
entry->MarkBinding(); // XXX
|
||||
rv = mMemoryDevice->BindEntry(entry);
|
||||
entry->ClearBinding(); // XXX
|
||||
|
@ -276,7 +276,7 @@
|
||||
var iconURL = this.buildFavIconString(aURI);
|
||||
if (!this.mMissedIconCache) {
|
||||
var cacheService = Components.classes['@mozilla.org/network/cache-service;1'].getService(Components.interfaces.nsICacheService);
|
||||
this.mMissedIconCache = cacheService.createSession("MissedIconCache", Components.interfaces.nsICache.STORE_ON_DISK, true);
|
||||
this.mMissedIconCache = cacheService.createSession("MissedIconCache", Components.interfaces.nsICache.STORE_ANYWHERE, true);
|
||||
if (!this.mMissedIconCache)
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user