Save large icons to a new LARGE_ICON type

components/history/core/browser/history_backend.cc

Index: components/history/core/browser/history_backend.cc
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
index faf00c6db8293356065862bd9fdc5e72a72ba4c8..eab447265c2ed556131284199c72556321f0f82e 100644
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
@@ -1844,6 +1844,7 @@ void HistoryBackend::UpdateFaviconMappingsAndFetchImpl(
   DCHECK(!page_url || icon_types == favicon_base::FAVICON ||
          icon_types == favicon_base::TOUCH_ICON ||
          icon_types == favicon_base::TOUCH_PRECOMPOSED_ICON ||
+         icon_types == favicon_base::LARGE_ICON ||
          icon_types ==
              (favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON));

[beaudoin, 2015/05/05 00:54:00]

I didn't check carefully but noticed above you're using:

icon_types = favicon_base::FAVICON | favicon_base::TOUCH_ICON |
favicon_base::TOUCH_PRECOMPOSED_ICON

Could it be possible for this DCHECK to fail?

[Roger McFarlane (Chromium), 2015/05/05 15:09:47]

If this DCHECK fails, it is catching a true error.

in favicion_handler.cc: The usage of FAVICON | TOUCH_ICON | TOUCH_PRECOMPOSED is
a mask where the (LARGE) favicon handler selects which types of icons it should
consider as candidates. The icons do not get tagged with the ORed mask.

in history_backend.cc: the usage is to update mappings for a given stored icon.
An icon is stored using a single type, and the mask above is to select which
types of icons to update with the given mapping. The final bitwise ORed mask is
to treat the two touch icon types are equivalent.

[beaudoin, 2015/05/05 19:47:52]

Acknowledged.

   bitmap_results->clear();