Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/history/history_backend.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 1873 matching lines @@
     const GURL& icon_url,
     scoped_refptr<GetFaviconRequest> request,
     int icon_types) {
   // Check only a single type was given when the page_url was specified.
   DCHECK(!page_url || (page_url && (icon_types == FAVICON ||
       icon_types == TOUCH_ICON || icon_types == TOUCH_PRECOMPOSED_ICON)));
 
   if (request->canceled())
     return;
 
-  FaviconData favicon;
+  std::vector<history::FaviconBitmapResult> favicon_bitmap_results;
 
   if (thumbnail_db_.get()) {
+    IconType icon_type;
     const FaviconID favicon_id =
         thumbnail_db_->GetFaviconIDForFaviconURL(
-            icon_url, icon_types, &favicon.icon_type);
+            icon_url, icon_types, &icon_type);
     if (favicon_id) {
-      scoped_refptr<base::RefCountedMemory> data;
-      Time last_updated;
-      if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data,
-                                    NULL, NULL)) {
-        favicon.known_icon = true;
-        favicon.expired = (Time::Now() - last_updated) >
-            TimeDelta::FromDays(kFaviconRefetchDays);
-        favicon.image_data = data;
-      }
+      GetFaviconFromDB(favicon_id, &favicon_bitmap_results);
 
       if (page_url)
-        SetFaviconMapping(*page_url, favicon_id, favicon.icon_type);
+        SetFaviconMapping(*page_url, favicon_id, icon_type);
     }
     // else case, haven't cached entry yet. Caller is responsible for
     // downloading the favicon and invoking SetFavicon.
   }
-  request->ForwardResult(request->handle(), favicon);
+  // TODO(pkotwicz): Pass map of |icon_url| to the sizes available from the web
+  // at |icon_url| instead of an empty map.
+  request->ForwardResult(request->handle(), favicon_bitmap_results,
+                         IconURLSizesMap());
 }
 
 void HistoryBackend::GetFaviconForURL(
     scoped_refptr<GetFaviconRequest> request,
     const GURL& page_url,
     int icon_types) {
   if (request->canceled())
     return;
 
-  FaviconData favicon;
+  std::vector<FaviconBitmapResult> favicon_bitmap_results;
 
   // Get the favicon from DB.
-  GetFaviconFromDB(page_url, icon_types, &favicon);
+  GetFaviconFromDB(page_url, icon_types, &favicon_bitmap_results);
 
-  request->ForwardResult(request->handle(), favicon);
+  // TODO(pkotwicz): Pass map of matched icon URLs for |icon_types| to the
+  // sizes that each icon URL is available at from the web instead of an
+  // empty map.
+  request->ForwardResult(request->handle(), favicon_bitmap_results,
+                         IconURLSizesMap());
 }
 
 void HistoryBackend::GetFaviconForID(scoped_refptr<GetFaviconRequest> request,
                                      FaviconID id) {
   if (request->canceled())
     return;
 
-  FaviconData favicon;
-  GetFaviconFromDB(id, &favicon);
-  request->ForwardResult(request->handle(), favicon);
+ std::vector<FaviconBitmapResult> favicon_bitmap_results;
+
+  // Get the favicon from DB.
+  GetFaviconFromDB(id, &favicon_bitmap_results);
+
+  // TODO(pkotwicz): Pass map of the matched icon URL to the sizes that it is
+  // available from the web instead of an empty map.
+  request->ForwardResult(request->handle(), favicon_bitmap_results,
+                         IconURLSizesMap());
 }
 
 void HistoryBackend::SetFavicon(
     const GURL& page_url,
     const GURL& icon_url,
     scoped_refptr<base::RefCountedMemory> data,
     IconType icon_type) {
   DCHECK(data.get());
   if (!thumbnail_db_.get() || !db_.get())
     return;
@@ skipping 481 matching lines @@
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 bool HistoryBackend::GetFaviconFromDB(
     const GURL& page_url,
     int icon_types,
-    FaviconData* favicon) {
-  DCHECK(favicon);
+    std::vector<FaviconBitmapResult>* favicon_bitmap_results) {
+  DCHECK(favicon_bitmap_results);
 
   if (!db_.get() || !thumbnail_db_.get())
     return false;
 
   bool success = false;
   // Time the query.
   TimeTicks beginning_time = TimeTicks::Now();
 
   std::vector<IconMapping> icon_mappings;
   // Iterate over the known icons looking for one that includes one of the
   // requested types.
   if (thumbnail_db_->GetIconMappingsForPageURL(page_url, &icon_mappings)) {
     for (std::vector<IconMapping>::iterator i = icon_mappings.begin();
          i != icon_mappings.end(); ++i) {
       if ((i->icon_type & icon_types) &&
-          GetFaviconFromDB(i->icon_id, favicon)) {
+          GetFaviconFromDB(i->icon_id, favicon_bitmap_results)) {
         success = true;
         break;
       }
     }
   }
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success;
 }
 
-bool HistoryBackend::GetFaviconFromDB(FaviconID favicon_id,
-                                      FaviconData* favicon) {
+bool HistoryBackend::GetFaviconFromDB(
+    FaviconID favicon_id,
+    std::vector<history::FaviconBitmapResult>* favicon_bitmap_results) {
+  FaviconBitmapResult bitmap_result;
   Time last_updated;
-  scoped_refptr<base::RefCountedMemory> data;
+  if (!thumbnail_db_->GetFavicon(favicon_id,
+                                 &last_updated,
+                                 &bitmap_result.bitmap_data,
+                                 &bitmap_result.icon_url,
+                                 &bitmap_result.icon_type)) {
+    return false;
+  }
 
-  if (!thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data,
-                                 &favicon->icon_url, &favicon->icon_type))
-    return false;
+  bitmap_result.expired = (Time::Now() - last_updated) >
+      TimeDelta::FromDays(kFaviconRefetchDays);
 
-  favicon->expired = (Time::Now() - last_updated) >
-      TimeDelta::FromDays(kFaviconRefetchDays);
-  favicon->known_icon = true;
-  favicon->image_data = data;
+  favicon_bitmap_results->clear();
+  if (bitmap_result.is_valid())
+    favicon_bitmap_results->push_back(bitmap_result);
   return true;
 }
 
 void HistoryBackend::NotifyVisitObservers(const VisitRow& visit) {
   BriefVisitInfo info;
   info.url_id = visit.url_id;
   info.time = visit.visit_time;
   info.transition = visit.transition;
   // If we don't have a delegate yet during setup or shutdown, we will drop
   // these notifications.
   if (delegate_.get())
     delegate_->NotifyVisitDBObserversOnAddVisit(info);
 }
 
 }  // namespace history