Give SelectFaviconFrames a quality score.

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 67 matching lines @@
     history::IconType icon_type)
     : url(url),
       image_url(image_url),
       callback(callback),
       icon_type(icon_type) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 FaviconHandler::FaviconCandidate::FaviconCandidate()
-    : bitmap_size(0),
+    : score(0),
       icon_type(history::INVALID_ICON) {
 }
 
 FaviconHandler::FaviconCandidate::~FaviconCandidate() {
 }
 
 FaviconHandler::FaviconCandidate::FaviconCandidate(
     const GURL& url,
     const GURL& image_url,
     const gfx::Image& image,
-    int bitmap_size,
+    float score,
     history::IconType icon_type)
     : url(url),
       image_url(image_url),
       image(image),
-      bitmap_size(bitmap_size),
+      score(score),
       icon_type(icon_type) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 FaviconHandler::FaviconHandler(Profile* profile,
                                FaviconHandlerDelegate* delegate,
                                Type icon_type)
     : got_favicon_from_history_(false),
       favicon_expired_(false),
@@ skipping 41 matching lines @@
   return ScheduleDownload(GURL(), image_url, image_size, icon_type, callback);
 }
 
 FaviconService* FaviconHandler::GetFaviconService() {
   return profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
 
 bool FaviconHandler::UpdateFaviconCandidate(const GURL& url,
                                             const GURL& image_url,
                                             const gfx::Image& image,
+                                            float score,
                                             history::IconType icon_type) {
   bool update_candidate = false;
   SkBitmap bitmap = *(image.ToSkBitmap());
-  int bitmap_size = std::max(bitmap.width(), bitmap.height());
-  bool exact_match = (bitmap_size == preferred_icon_size());
+  bool exact_match = score == 1;
   if (preferred_icon_size() == 0) {
     // No preferred size, use this icon.
     update_candidate = true;
     exact_match = true;
   } else if (favicon_candidate_.icon_type == history::INVALID_ICON) {
     // No current candidate, use this.
     update_candidate = true;
   } else {
-    if (bitmap_size == preferred_icon_size()) {
+    if (exact_match) {
       // Exact match, use this.
       update_candidate = true;
     } else {
       // Compare against current candidate.
-      int cur_size = favicon_candidate_.bitmap_size;
-      if ((bitmap_size >= preferred_icon_size() && bitmap_size < cur_size) ||
-          (cur_size < preferred_icon_size() && bitmap_size > cur_size)) {
+      if (score > favicon_candidate_.score)
         update_candidate = true;
-      }
     }
   }
   if (update_candidate) {
     favicon_candidate_ = FaviconCandidate(
-        url, image_url, image, bitmap_size, icon_type);
+        url, image_url, image, score, icon_type);
   }
   return exact_match;
 }
 
 void FaviconHandler::SetFavicon(
     const GURL& url,
     const GURL& image_url,
     const gfx::Image& image,
     history::IconType icon_type) {
   SkBitmap bitmap = *(image.ToSkBitmap());
@@ skipping 83 matching lines @@
   }
 
   if (got_favicon_from_history_)
     DownloadFaviconOrAskHistory(entry->GetURL(), current_candidate()->icon_url,
         ToHistoryIconType(current_candidate()->icon_type));
 }
 
 void FaviconHandler::OnDidDownloadFavicon(int id,
                                           const GURL& image_url,
                                           bool errored,
-                                          const gfx::Image& image) {
+                                          const gfx::Image& image,
+                                          float score) {
   DownloadRequests::iterator i = download_requests_.find(id);
   if (i == download_requests_.end()) {
     // Currently WebContents notifies us of ANY downloads so that it is
     // possible to get here.
     return;
   }
 
   if (!i->second.callback.is_null()) {
     i->second.callback.Run(id, errored, *image.ToSkBitmap());
   } else if (current_candidate() &&
              DoUrlAndIconMatch(*current_candidate(), image_url,
                                i->second.icon_type)) {
     // The downloaded icon is still valid when there is no FaviconURL update
     // during the downloading.
     bool request_next_icon = true;
     if (!errored) {
       request_next_icon = !UpdateFaviconCandidate(
-          i->second.url, image_url, image, i->second.icon_type);
+          i->second.url, image_url, image, score, i->second.icon_type);
     }
     if (request_next_icon && GetEntry() && image_urls_.size() > 1) {
       // Remove the first member of image_urls_ and process the remaining.
       image_urls_.pop_front();
       ProcessCurrentUrl();
     } else if (favicon_candidate_.icon_type != history::INVALID_ICON) {
       // No more icons to request, set the favicon from the candidate.
       SetFavicon(favicon_candidate_.url,
                  favicon_candidate_.image_url,
                  favicon_candidate_.image,
@@ skipping 208 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;
 }