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

Unified Diff: chrome/browser/history/history_service.cc

Issue 531493002: Move encoding SkBitmaps to PNG out of FaviconService::SetFavicons() and onto the history thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 6618462bcbdd7c49c2bdb4d8f1df4f647cb35e3d..3bbb0e9d0766f06d97417624c347a2212d3395a8 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -617,18 +617,18 @@ void HistoryService::MergeFavicon(
icon_url, icon_type, bitmap_data, pixel_size);
}
-void HistoryService::SetFavicons(
+void HistoryService::SetFavicon(
const GURL& page_url,
favicon_base::IconType icon_type,
- const std::vector<favicon_base::FaviconRawBitmapData>&
- favicon_bitmap_data) {
+ const GURL& icon_url,
+ const std::vector<SkBitmap>& bitmaps) {
DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
if (!CanAddURL(page_url))
return;
- ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavicons, page_url,
- icon_type, favicon_bitmap_data);
+ ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavicon, page_url,
+ icon_type, icon_url, bitmaps);
}
void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) {
« chrome/browser/history/history_service.h ('K') | « chrome/browser/history/history_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698