favicon handler: Consider all frames when receiving favicons from the history db

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>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
+#include "chrome/browser/favicon/select_favicon_frames.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
 
 using content::NavigationEntry;
 
 namespace {
 
 // Returns history::IconType the given icon_type corresponds to.
 history::IconType ToHistoryIconType(FaviconURL::IconType icon_type) {
   switch (icon_type) {
     case FaviconURL::FAVICON:
@@ skipping 191 matching lines @@
   if (UrlMatches(url, url_) && icon_type == history::FAVICON) {
     NavigationEntry* entry = GetEntry();
     if (entry) {
       entry->GetFavicon().url = image_url;
       UpdateFavicon(entry, &sized_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());
+    const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results) {

[pkotwicz, 2012/09/05 14:08:46]

Nit:
Can we put the code for converting from a FaviconBitmapResult vector to a
gfx::Image into FaviconUtil?
There is some similar code in FaviconService.

Heads up:
We will have to eventually add a non resized version of the bitmaps into
FaviconStatus as well to deal with the call to favicon_service->SetFavicon() in
instant_controller.

[Nico, 2012/09/05 14:48:54]

Done.

+  std::vector<SkBitmap> bitmaps;
+  for (size_t i = 0; i < favicon_bitmap_results.size(); ++i) {
+    SkBitmap bitmap;
+    if (gfx::PNGCodec::Decode(favicon_bitmap_results[i].bitmap_data->front(),
+                              favicon_bitmap_results[i].bitmap_data->size(),
+                              &bitmap)) {
+      bitmaps.push_back(bitmap);
+    }
+  }
+
+  if (bitmaps.empty())
+    return;
+
+  gfx::ImageSkia resized_image_skia = SelectFaviconFrames(bitmaps,
+      ui::GetSupportedScaleFactors(), preferred_icon_size(), NULL);
+  gfx::Image resized_image(resized_image_skia);
+  UpdateFavicon(entry, &resized_image);
 }
 
 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;
 
@@ skipping 185 matching lines @@
       !entry->GetFavicon().valid &&
       (!current_candidate() ||
        DoUrlAndIconMatch(*current_candidate(),
                          bitmap_result.icon_url, bitmap_result.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 = bitmap_result.icon_url;
     if (bitmap_result.is_valid())
-      UpdateFavicon(entry, bitmap_result.bitmap_data);
+      UpdateFavicon(entry, favicon_bitmap_results);
     entry->GetFavicon().valid = true;
   }
 
   if (has_results && !bitmap_result.expired) {
     if (current_candidate() &&
         !DoUrlAndIconMatch(*current_candidate(),
             bitmap_result.icon_url, bitmap_result.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.
@@ skipping 54 matching lines @@
   if (has_results)
     bitmap_result = favicon_bitmap_results[0];
 
   // No need to update the favicon url. By the time we get here
   // UpdateFaviconURL will have set the favicon url.
   if (has_results && bitmap_result.icon_type == history::FAVICON) {
     if (bitmap_result.is_valid()) {
       // 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, bitmap_result.bitmap_data);
+      UpdateFavicon(entry, favicon_bitmap_results);
     }
     if (HasExpiredFaviconResult(favicon_bitmap_results)) {
       // The favicon 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() &&
       (!has_results || HasExpiredFaviconResult(favicon_bitmap_results) ||
@@ skipping 33 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;
 }