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

chrome/browser/favicon/favicon_service.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_service.h"
 
+#include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/favicon/select_favicon_frames.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/url_constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ skipping 205 matching lines @@
   }
   return handle;
 }
 
 void FaviconService::GetFaviconImageCallback(
     int desired_size_in_dip,
     FaviconImageCallback callback,
     Handle handle,
     std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
     history::IconURLSizesMap icon_url_sizes_map) {
-  std::vector<SkBitmap> sk_bitmaps;
-  for (size_t i = 0; i < favicon_bitmap_results.size(); ++i) {
-    if (favicon_bitmap_results[i].is_valid()) {
-      scoped_refptr<base::RefCountedMemory> bitmap_data =
-          favicon_bitmap_results[i].bitmap_data;
-      SkBitmap out_bitmap;
-      if (gfx::PNGCodec::Decode(bitmap_data->front(), bitmap_data->size(),
-                                &out_bitmap)) {
-        sk_bitmaps.push_back(out_bitmap);
-      }
-    }
-  }
   history::FaviconImageResult image_result;
-  image_result.image = gfx::Image(SelectFaviconFrames(
-      sk_bitmaps, ui::GetSupportedScaleFactors(), desired_size_in_dip, NULL));
-  image_result.icon_url = favicon_bitmap_results.empty() ?
+  image_result.image = FaviconUtil::SelectFaviconFramesFromPNGs(
+      favicon_bitmap_results,
+      ui::GetSupportedScaleFactors(),
+      desired_size_in_dip);
+  image_result.icon_url = image_result.image.IsEmpty() ?
       GURL() : favicon_bitmap_results[0].icon_url;
-
   callback.Run(handle, image_result);
 }
 
 void FaviconService::GetRawFaviconCallback(
     int desired_size_in_dip,
     ui::ScaleFactor desired_scale_factor,
     FaviconRawCallback callback,
     Handle handle,
     std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
     history::IconURLSizesMap icon_url_sizes_map) {
@@ skipping 43 matching lines @@
   bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector(
       &resized_bitmap_data);
   callback.Run(handle, bitmap_result);
 }
 
 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) {
   request->ForwardResultAsync(request->handle(),
                               std::vector<history::FaviconBitmapResult>(),
                               history::IconURLSizesMap());
 }