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

Unified Diff: chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc

Issue 1763273002: base: Remove OwningMRUCache in favor of scoped_ptrs in MRUCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + fix Created 4 years, 9 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: chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
index 8f0c08c1fa947a06679f100d494539b7f941f023..15266ce987522443181835c0068bf256bfbbb8fc 100644
--- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
+++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
@@ -96,9 +96,9 @@ BitmapFetcherService::RequestId BitmapFetcherService::RequestImage(
return REQUEST_ID_INVALID;
// Check for existing images first.
- base::OwningMRUCache<GURL, CacheEntry*>::iterator iter = cache_.Get(url);
+ auto iter = cache_.Get(url);
if (iter != cache_.end()) {
- BitmapFetcherService::CacheEntry* entry = iter->second;
+ BitmapFetcherService::CacheEntry* entry = iter->second.get();
request->NotifyImageChanged(entry->bitmap.get());
// There is no request ID associated with this - data is already delivered.
@@ -184,9 +184,9 @@ void BitmapFetcherService::OnFetchComplete(const GURL& url,
}
if (bitmap && !bitmap->isNull()) {
- CacheEntry* entry = new CacheEntry;
+ scoped_ptr<CacheEntry> entry(new CacheEntry);
gone 2016/03/07 22:01:32 nit: make_scoped_ptr?
danakj 2016/03/07 22:02:42 lol. I asked the opposite in the previous patch se
gone 2016/03/07 22:03:33 lol! I'm fine either way.
entry->bitmap.reset(new SkBitmap(*bitmap));
- cache_.Put(fetcher->url(), entry);
+ cache_.Put(fetcher->url(), std::move(entry));
}
RemoveFetcher(fetcher);
« no previous file with comments | « chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h ('k') | chrome/browser/ui/app_list/search/common/webservice_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698