[Favicon] Add new fallback icon rendering flow.

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 <cmath>
 
 #include "base/hash.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon_base/favicon_types.h"
+#include "components/favicon_base/fallback_icon_service.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "extensions/common/constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
+#include "url/gurl.h"
 
 using base::Bind;
 
 namespace {
 
+const int kMaxFallbackFaviconSize = 288;
+
 void CancelOrRunFaviconResultsCallback(
     const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
     const favicon_base::FaviconResultsCallback& callback,
     const std::vector<favicon_base::FaviconRawBitmapResult>& results) {
   if (is_canceled.Run())
     return;
   callback.Run(results);
 }
 
 // Helper to run callback with empty results if we cannot get the history
@@ skipping 34 matching lines @@
   }
   return sizes_in_pixel;
 }
 
 }  // namespace
 
 FaviconService::FaviconService(Profile* profile, FaviconClient* favicon_client)
     : history_service_(HistoryServiceFactory::GetForProfile(
           profile,
           ServiceAccessType::EXPLICIT_ACCESS)),
+      fallback_icon_service_(new favicon_base::FallbackIconService()),
       profile_(profile),
       favicon_client_(favicon_client) {
 }
 
 // static
 void FaviconService::FaviconResultsCallbackRunner(
     const favicon_base::FaviconResultsCallback& callback,
     const std::vector<favicon_base::FaviconRawBitmapResult>* results) {
   callback.Run(*results);
 }
@@ skipping 69 matching lines @@
       page_url,
       favicon_base::FAVICON,
       GetPixelSizesForFaviconScales(gfx::kFaviconSize),
       Bind(&FaviconService::RunFaviconImageCallbackWithBitmapResults,
            base::Unretained(this),
            callback,
            gfx::kFaviconSize),
       tracker);
 }
 
+base::CancelableTaskTracker::TaskId FaviconService::GetRawFallbackFaviconImage(
+    const GURL& icon_url,
+    favicon_base::IconType icon_type,
+    int desired_size_in_pixel,
+    const favicon_base::FallbackIconSpecs& specs,
+    const favicon_base::FaviconRawBitmapCallback& callback,
+    base::CancelableTaskTracker* tracker) {
+  int size_to_use = desired_size_in_pixel;
+  if (desired_size_in_pixel == 0 ||
+      desired_size_in_pixel > kMaxFallbackFaviconSize) {
+    size_to_use = kMaxFallbackFaviconSize;
+  }
+
+  favicon_base::FaviconResultsCallback callback_runner =
+      Bind(&FaviconService::RunFaviconRawBitmapCallbackWithBitmapResults,
+           base::Unretained(this),
+           callback,
+           size_to_use);
+
+  return fallback_icon_service_->GetFallbackIcon(
+      icon_url, size_to_use, specs, callback_runner, tracker);
+}
+
 base::CancelableTaskTracker::TaskId FaviconService::GetRawFaviconForPageURL(
     const GURL& page_url,
     int icon_types,
     int desired_size_in_pixel,
     const favicon_base::FaviconRawBitmapCallback& callback,
     base::CancelableTaskTracker* tracker) {
   std::vector<int> desired_sizes_in_pixel;
   desired_sizes_in_pixel.push_back(desired_size_in_pixel);
   return GetFaviconForPageURLImpl(
       page_url,
@@ skipping 235 matching lines @@
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false,
                                          &resized_bitmap_data)) {
     callback.Run(favicon_base::FaviconRawBitmapResult());
     return;
   }
 
   bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector(
       &resized_bitmap_data);
   callback.Run(bitmap_result);
 }