Chromium Code Reviews| 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); |