Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: ios/chrome/browser/snapshots/snapshot_cache.mm

Issue 2660143002: Removing iPad Tab Switcher experimental flag. (Closed)
Patch Set: Rebased. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/snapshots/snapshot_cache.mm
diff --git a/ios/chrome/browser/snapshots/snapshot_cache.mm b/ios/chrome/browser/snapshots/snapshot_cache.mm
index d648eba7c3002203e32e2bbe291057bdde45e343..7fb720d8c21ab9c55791dd7c850208a8d56a891a 100644
--- a/ios/chrome/browser/snapshots/snapshot_cache.mm
+++ b/ios/chrome/browser/snapshots/snapshot_cache.mm
@@ -232,9 +232,6 @@ void ConvertAndSaveGreyImage(
DCHECK_CURRENTLY_ON(web::WebThread::UI);
DCHECK(sessionID);
- if (![self inMemoryCacheIsEnabled] && !callback)
- return;
-
UIImage* img = nil;
if (lruCache_)
img = [lruCache_ objectForKey:sessionID];
@@ -256,7 +253,7 @@ void ConvertAndSaveGreyImage(
[SnapshotCache imagePathForSessionID:sessionID]) retain]);
}),
base::BindBlock(^(base::scoped_nsobject<UIImage> image) {
- if ([self inMemoryCacheIsEnabled] && image) {
+ if (image) {
if (lruCache_)
[lruCache_ setObject:image forKey:sessionID];
else
@@ -272,12 +269,11 @@ void ConvertAndSaveGreyImage(
if (!img || !sessionID)
return;
- if ([self inMemoryCacheIsEnabled]) {
- if (lruCache_)
- [lruCache_ setObject:img forKey:sessionID];
- else
- [imageDictionary_ setObject:img forKey:sessionID];
- }
+ if (lruCache_)
+ [lruCache_ setObject:img forKey:sessionID];
+ else
+ [imageDictionary_ setObject:img forKey:sessionID];
+
// Save the image to disk.
web::WebThread::PostBlockingPoolSequencedTask(
kSequenceToken, FROM_HERE,
@@ -403,15 +399,9 @@ void ConvertAndSaveGreyImage(
}
}
-- (BOOL)inMemoryCacheIsEnabled {
- // In-memory cache on iPad is enabled only when the tab switcher is enabled.
- return !IsIPadIdiom() || experimental_flags::IsTabSwitcherEnabled();
-}
-
- (BOOL)usesLRUCache {
- // Always use the LRUCache when the tab switcher is enabled.
- return experimental_flags::IsTabSwitcherEnabled() ||
- experimental_flags::IsLRUSnapshotCacheEnabled();
+ // TODO(crbug.com/687904): Remove the non-LRU cache code.
+ return true;
}
- (void)handleLowMemory {

Powered by Google App Engine
This is Rietveld 408576698