[Favicon] Add new fallback icon rendering flow.

chrome/browser/ui/webui/favicon_source.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/ui/webui/favicon_source.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/sync/open_tabs_ui_delegate.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/favicon/favicon_url_parser.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/locale_settings.h"
+#include "components/favicon_base/fallback_icon_specs_builder.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/resources/grit/ui_resources.h"
 
 FaviconSource::IconRequest::IconRequest()
     : size_in_dip(gfx::kFaviconSize), device_scale_factor(1.0f) {
 }
@@ skipping 43 matching lines @@
   bool success = chrome::ParseFaviconPath(path, icon_types_, &parsed);
   if (!success) {
     SendDefaultResponse(callback);
     return;
   }
 
   GURL url(parsed.url);
   int desired_size_in_pixel =
       std::ceil(parsed.size_in_dip * parsed.device_scale_factor);
 
-  if (parsed.is_icon_url) {
-    // TODO(michaelbai): Change GetRawFavicon to support combination of
-    // IconType.
-   favicon_service->GetRawFavicon(
-        url,
-        favicon_base::FAVICON,
-        desired_size_in_pixel,
+  if (parsed.fallback_specs_builder || parsed.is_icon_url) {
+    favicon_base::FaviconRawBitmapCallback wrapped_callback =
         base::Bind(
             &FaviconSource::OnFaviconDataAvailable,
             base::Unretained(this),
             IconRequest(
-                callback, url, parsed.size_in_dip, parsed.device_scale_factor)),
-        &cancelable_task_tracker_);
+                callback, url, parsed.size_in_dip, parsed.device_scale_factor));
+    if (parsed.fallback_specs_builder) {

[pkotwicz, 2015/01/19 04:32:02]

Can you move the code for parsing the URLs for fallback icons to a new class
which inherits from content::URLDataSource? Once we are ready to have fallback
icons used everywhere that favicons are used, you can move the parsing logic to
this class.

[huangs, 2015/01/20 22:20:41]

Done.

+      favicon_service->GetRawFallbackFaviconImage(
+          url,
+          icon_types_ == favicon_base::FAVICON ?
+              favicon_base::FAVICON : favicon_base::TOUCH_ICON,
+          desired_size_in_pixel,
+          parsed.fallback_specs_builder->Build(),
+          wrapped_callback,
+          &cancelable_task_tracker_);
+    } else {
+      DCHECK(parsed.is_icon_url);
+      // TODO(michaelbai): Change GetRawFavicon to support combination of
+      // IconType.
+      favicon_service->GetRawFavicon(
+          url,
+          favicon_base::FAVICON,
+          desired_size_in_pixel,
+          wrapped_callback,
+          &cancelable_task_tracker_);
+    }
   } else {
     // Intercept requests for prepopulated pages.
     for (int i = 0; i < history::kPrepopulatedPagesCount; i++) {
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
         ui::ScaleFactor resource_scale_factor =
             ui::GetSupportedScaleFactor(parsed.device_scale_factor);
         callback.Run(
             ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
@@ skipping 90 matching lines @@
     ui::ScaleFactor resource_scale_factor =
         ui::GetSupportedScaleFactor(icon_request.device_scale_factor);
     default_favicon =
         ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, resource_scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
   icon_request.callback.Run(default_favicon);
 }