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

chrome/browser/favicon/favicon_handler.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/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 258 matching lines @@
 
   // For FAVICON.
   if (current_candidate()->icon_type == FaviconURL::FAVICON) {
     if (!favicon_expired_ && entry->GetFavicon().valid &&
         DoUrlAndIconMatch(*current_candidate(), entry->GetFavicon().url,
                           history::FAVICON))
       return;
 
     entry->GetFavicon().url = current_candidate()->icon_url;
   } else if (!favicon_expired_ && got_favicon_from_history_ &&
-              history_icon_.is_valid() &&
+              history_icon_.has_valid_bitmaps() &&
               DoUrlAndIconMatch(
                   *current_candidate(),
                   history_icon_.icon_url, history_icon_.icon_type)) {
     return;
   }
 
   if (got_favicon_from_history_)
     DownloadFaviconOrAskHistory(entry->GetURL(), current_candidate()->icon_url,
         ToHistoryIconType(current_candidate()->icon_type));
 }
@@ skipping 99 matching lines @@
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForProfile(profile_);
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }
 
 void FaviconHandler::OnFaviconDataForInitialURL(
     FaviconService::Handle handle,
-    history::FaviconData favicon) {
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
   NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   got_favicon_from_history_ = true;
-  history_icon_ = favicon;
+  history_icon_ = favicon_data;
 
-  favicon_expired_ = (favicon.known_icon && favicon.expired);
+  favicon_expired_ = (favicon_data.known_icon && favicon_data.expired());
 
-  if (favicon.known_icon && favicon.icon_type == history::FAVICON &&
+  if (favicon_data.known_icon && favicon_data.icon_type == history::FAVICON &&
       !entry->GetFavicon().valid &&
       (!current_candidate() ||
-       DoUrlAndIconMatch(
-           *current_candidate(), favicon.icon_url, favicon.icon_type))) {
+       DoUrlAndIconMatch(*current_candidate(),
+                         favicon_data.icon_url, favicon_data.icon_type))) {
     // The db knows the favicon (although it may be out of date) and the entry
     // doesn't have an icon. Set the favicon now, and if the favicon turns out
     // to be expired (or the wrong url) we'll fetch later on. This way the
     // user doesn't see a flash of the default favicon.
-    entry->GetFavicon().url = favicon.icon_url;
-    if (favicon.is_valid())
-      UpdateFavicon(entry, favicon.image_data);
+    entry->GetFavicon().url = favicon_data.icon_url;
+    if (favicon_data.has_valid_bitmaps())
+      UpdateFavicon(entry, favicon_data.first_bitmap());
     entry->GetFavicon().valid = true;
   }
 
-  if (favicon.known_icon && !favicon.expired) {
+  if (favicon_data.known_icon && !favicon_data.expired()) {
     if (current_candidate() &&
-        !DoUrlAndIconMatch(
-             *current_candidate(), favicon.icon_url, favicon.icon_type)) {
+        !DoUrlAndIconMatch(*current_candidate(),
+            favicon_data.icon_url, favicon_data.icon_type)) {
       // Mapping in the database is wrong. DownloadFavIconOrAskHistory will
       // update the mapping for this url and download the favicon if we don't
       // already have it.
       DownloadFaviconOrAskHistory(entry->GetURL(),
           current_candidate()->icon_url,
           static_cast<history::IconType>(current_candidate()->icon_type));
     }
   } else if (current_candidate()) {
     // We know the official url for the favicon, by either don't have the
     // favicon or its expired. Continue on to DownloadFaviconOrAskHistory to
@@ skipping 28 matching lines @@
       // This is asynchronous. The history service will call back when done.
       // Issue the request and associate the current page ID with it.
       UpdateFaviconMappingAndFetch(page_url, icon_url, icon_type,
           &cancelable_consumer_,
           base::Bind(&FaviconHandler::OnFaviconData, base::Unretained(this)));
     }
   }
 }
 
 void FaviconHandler::OnFaviconData(FaviconService::Handle handle,
-                                  history::FaviconData favicon) {
+                                  history::FaviconData favicon_data,
+                                  std::vector<GURL> icon_urls_in_db) {
   NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   // No need to update the favicon url. By the time we get here
   // UpdateFaviconURL will have set the favicon url.
-  if (favicon.icon_type == history::FAVICON) {
-    if (favicon.is_valid()) {
+  if (favicon_data.icon_type == history::FAVICON) {
+    if (favicon_data.has_valid_bitmaps()) {
       // There is a favicon, set it now. If expired we'll download the current
       // one again, but at least the user will get some icon instead of the
       // default and most likely the current one is fine anyway.
-      UpdateFavicon(entry, favicon.image_data);
+      UpdateFavicon(entry, favicon_data.first_bitmap());
     }
-    if (!favicon.known_icon || favicon.expired) {
+    if (!favicon_data.known_icon || favicon_data.expired()) {
       // We don't know the favicon, or it is out of date. Request the current
       // one.
       ScheduleDownload(entry->GetURL(), entry->GetFavicon().url,
                        preferred_icon_size(),
                        history::FAVICON,
                        FaviconTabHelper::ImageDownloadCallback());
     }
-  } else if (current_candidate() && (!favicon.known_icon || favicon.expired ||
-      !(DoUrlAndIconMatch(
-            *current_candidate(), favicon.icon_url, favicon.icon_type)))) {
+  } else if (current_candidate() &&
+      (!favicon_data.known_icon || favicon_data.expired() ||
+       !(DoUrlAndIconMatch(*current_candidate(),
+           favicon_data.icon_url, favicon_data.icon_type)))) {
     // We don't know the favicon, it is out of date or its type is not same as
     // one got from page. Request the current one.
     ScheduleDownload(entry->GetURL(), current_candidate()->icon_url,
         preferred_icon_size(),
         ToHistoryIconType(current_candidate()->icon_type),
         FaviconTabHelper::ImageDownloadCallback());
   }
-  history_icon_ = favicon;
+  history_icon_ = favicon_data;
 }
 
 int FaviconHandler::ScheduleDownload(
     const GURL& url,
     const GURL& image_url,
     int image_size,
     history::IconType icon_type,
     const FaviconTabHelper::ImageDownloadCallback& callback) {
   const int download_id = DownloadFavicon(image_url, image_size);
   if (download_id) {
@@ skipping 13 matching lines @@
   int height = bitmap.height();
   if (width > 0 && height > 0) {
     gfx::CalculateFaviconTargetSize(&width, &height);
     return gfx::Image(skia::ImageOperations::Resize(
                           bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
                           width, height));
   }
 
   return image;
 }