Make FaviconService::GetRawFaviconForPageURL() select the best candidate among all the icon types

components/favicon/core/favicon_service.h

 // Copyright (c) 2017 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.
 
 #ifndef COMPONENTS_FAVICON_CORE_FAVICON_SERVICE_H_
 #define COMPONENTS_FAVICON_CORE_FAVICON_SERVICE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 72 matching lines @@
   // resized.
   virtual base::CancelableTaskTracker::TaskId GetFaviconImageForPageURL(
       const GURL& page_url,
       const favicon_base::FaviconImageCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
   // Requests the favicon for the page at |page_url| with one of |icon_types|
   // and with |desired_size_in_pixel|. |icon_types| can be any combination of
   // IconTypes. If favicon bitmaps for several IconTypes are available, the
   // favicon bitmap is chosen in the priority of TOUCH_PRECOMPOSED_ICON,
   // TOUCH_ICON and FAVICON. If there is no favicon bitmap of size

[mastiz, 2017/04/18 08:04:34]

Update?

[pkotwicz, 2017/04/20 04:06:19]

Done.

   // |desired_size_in_pixel|, the favicon bitmap which best matches
   // |desired_size_in_pixel| is resized. If |desired_size_in_pixel| is 0,
   // the largest favicon bitmap is returned. Results with a higher priority
   // IconType are preferred over an exact match of the favicon bitmap size.
   virtual base::CancelableTaskTracker::TaskId GetRawFaviconForPageURL(
       const GURL& page_url,
       int icon_types,
       int desired_size_in_pixel,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
   // See HistoryService::GetLargestFaviconForPageURL().
   virtual base::CancelableTaskTracker::TaskId GetLargestRawFaviconForPageURL(
       const GURL& page_url,
       const std::vector<int>& icon_types,
       int minimum_size_in_pixels,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
   virtual base::CancelableTaskTracker::TaskId GetFaviconForPageURL(
       const GURL& page_url,
       int icon_types,
       int desired_size_in_dip,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
-  // Set the favicon mappings to |page_url| for |icon_types| in the history
-  // database.
-  // Sample |icon_urls|:
-  //  { ICON_URL1 -> TOUCH_ICON, known to the database,
-  //    ICON_URL2 -> TOUCH_ICON, not known to the database,
-  //    ICON_URL3 -> TOUCH_PRECOMPOSED_ICON, known to the database }
-  // The new mappings are computed from |icon_urls| with these rules:
-  // 1) Any urls in |icon_urls| which are not already known to the database are
-  //    rejected.
-  //    Sample new mappings to |page_url|: { ICON_URL1, ICON_URL3 }
-  // 2) If |icon_types| has multiple types, the mappings are only set for the
-  //    largest icon type.
-  //    Sample new mappings to |page_url|: { ICON_URL3 }
-  // |icon_types| can only have multiple IconTypes if
-  // |icon_types| == TOUCH_ICON | TOUCH_PRECOMPOSED_ICON.
-  // The favicon bitmaps which most closely match |desired_size_in_dip|
-  // at the reosurce scale factors supported by the current platform (eg MacOS)
-  // in addition to 1x from the favicons which were just mapped to |page_url|
-  // are returned. If |desired_size_in_dip| is 0, the largest favicon bitmap is
-  // returned.
+  // Maps |page_url| to the favicon at |icon_url| if there is an entry in the
+  // database for |icon_url| and |icon_type|. This occurs when there is a
+  // mapping from a different page URL to |icon_url|. The favicon bitmaps whose
+  // edge sizes most closely match |desired_sizes| from the favicons which were
+  // just mapped to |page_url| are returned. If |desired_sizes| has a '0' entry,
+  // the largest favicon bitmap is returned.
   virtual base::CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch(
       const GURL& page_url,
-      const std::vector<GURL>& icon_urls,
-      int icon_types,
+      const GURL& icon_url,
+      favicon_base::IconType icon_type,
       int desired_size_in_dip,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker) = 0;
 
   // Used to request a bitmap for the favicon with |favicon_id| which is not
   // resized from the size it is stored at in the database. If there are
   // multiple favicon bitmaps for |favicon_id|, the largest favicon bitmap is
   // returned.
   virtual base::CancelableTaskTracker::TaskId GetLargestRawFaviconForID(
       favicon_base::FaviconID favicon_id,
@@ skipping 51 matching lines @@
 
   // Avoid repeated requests to download missing favicon.
   virtual void UnableToDownloadFavicon(const GURL& icon_url) = 0;
   virtual bool WasUnableToDownloadFavicon(const GURL& icon_url) const = 0;
   virtual void ClearUnableToDownloadFavicons() = 0;
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_SERVICE_H_