Use hi-resolution favicon variants if available.

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 148 matching lines @@
   return profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
 
 bool FaviconHandler::UpdateFaviconCandidate(const GURL& url,
                                             const GURL& image_url,
                                             const gfx::Image& image,
                                             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());
+fprintf(stderr, "size: %d %d\n", bitmap_size, preferred_icon_size());
+  bool exact_match = (bitmap_size == preferred_icon_size() || bitmap_size / 2 == preferred_icon_size());  // XXX
   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()) {
       // Exact match, use this.
@@ skipping 12 matching lines @@
         url, image_url, image, bitmap_size, 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());
+  SkBitmap bitmap = *(image.ToSkBitmap());  // XXX
   const gfx::Image& sized_image = (preferred_icon_size() == 0 ||
       (preferred_icon_size() == bitmap.width() &&
        preferred_icon_size() == bitmap.height())) ?
       image : ResizeFaviconIfNeeded(image);
 
   if (GetFaviconService() && ShouldSaveFavicon(url)) {
     std::vector<unsigned char> image_data;
     if (gfx::PNGEncodedDataFromImage(sized_image, &image_data))
       SetHistoryFavicon(url, image_url, image_data, icon_type);
   }
 
   if (UrlMatches(url, url_) && icon_type == history::FAVICON) {
     NavigationEntry* entry = GetEntry();
     if (entry) {
       entry->GetFavicon().url = image_url;
-      UpdateFavicon(entry, &sized_image);
+      //UpdateFavicon(entry, &sized_image);
+      UpdateFavicon(entry, &image);
     }
   }
 }
 
 void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    scoped_refptr<base::RefCountedMemory> data) {
   scoped_ptr<gfx::Image> image(gfx::ImageFromPNGEncodedData(data->front(),
                                                             data->size()));
   UpdateFavicon(entry, image.get());
 }
 
 void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    const gfx::Image* image) {
   // No matter what happens, we need to mark the favicon as being set.
   entry->GetFavicon().valid = true;
 
   if (!image)
     return;
 
-  entry->GetFavicon().bitmap = *image->ToSkBitmap();
+  entry->GetFavicon().bitmap = *image->ToSkBitmap();  // XXX
+  entry->GetFavicon().image = *image;
   delegate_->NotifyFaviconUpdated();
 }
 
 void FaviconHandler::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
 
   image_urls_.clear();
   favicon_candidate_ = FaviconCandidate();
   for (std::vector<FaviconURL>::const_iterator i = candidates.begin();
@@ skipping 85 matching lines @@
 NavigationEntry* FaviconHandler::GetEntry() {
   NavigationEntry* entry = delegate_->GetActiveEntry();
   if (entry && UrlMatches(entry->GetURL(), url_))
     return entry;
 
   // If the URL has changed out from under us (as will happen with redirects)
   // return NULL.
   return NULL;
 }
 
-int FaviconHandler::DownloadFavicon(const GURL& image_url, int image_size) {
+int FaviconHandler::DownloadFavicon(const GURL& image_url, const std::vector<int>& image_size) {
   if (!image_url.is_valid()) {
     NOTREACHED();
     return 0;
   }
   int id = delegate_->StartDownload(image_url, image_size);
   return id;
 }
 
 void FaviconHandler::UpdateFaviconMappingAndFetch(
     const GURL& page_url,
@@ skipping 81 matching lines @@
     // We know the official url for the favicon, by either don't have the
     // favicon or its expired. Continue on to DownloadFaviconOrAskHistory to
     // either download or check history again.
     DownloadFaviconOrAskHistory(entry->GetURL(), current_candidate()->icon_url,
         ToHistoryIconType(current_candidate()->icon_type));
   }
   // else we haven't got the icon url. When we get it we'll ask the
   // renderer to download the icon.
 }
 
+// XXX
 void FaviconHandler::DownloadFaviconOrAskHistory(
     const GURL& page_url,
     const GURL& icon_url,
     history::IconType icon_type) {
   if (favicon_expired_) {
     // We have the mapping, but the favicon is out of date. Download it now.
     ScheduleDownload(page_url, icon_url, preferred_icon_size(), icon_type,
                      FaviconTabHelper::ImageDownloadCallback());
   } else if (GetFaviconService()) {
     // We don't know the favicon, but we may have previously downloaded the
@@ skipping 51 matching lines @@
   }
   history_icon_ = favicon;
 }
 
 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);
+  std::vector<int> sizes;
+  sizes.push_back(image_size);
+  sizes.push_back(2 * image_size);  // XXX mac-specific

[pkotwicz, 2012/08/02 23:47:08]

Can you use ui::GetSupportedScaleFactors here instead. We will probably end up
using something different than ui::GetSupportedScaleFactors. But
ui::GetSupportedScaleFactors is slightly better than this.

+  const int download_id = DownloadFavicon(image_url, sizes);
   if (download_id) {
     // Download ids should be unique.
     DCHECK(download_requests_.find(download_id) == download_requests_.end());
     download_requests_[download_id] =
         DownloadRequest(url, image_url, callback, icon_type);
   }
 
   return download_id;
 }
 
 gfx::Image FaviconHandler::ResizeFaviconIfNeeded(const gfx::Image& image) {
   // Get an SkBitmap from the gfx::Image.
   SkBitmap bitmap = *image.ToSkBitmap();
   int width = bitmap.width();
   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;
 }