Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index b751760e875a96d936493999518c98ef5df570c5..9cb4f583e24eeb7a36feeefa05b8167052c585ac 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/ref_counted_util.h"
+#include "ui/base/layout.h"
 
 class GURL;
 class HistoryService;
@@ -30,30 +31,79 @@ class FaviconService : public CancelableRequestProvider,
 
   virtual ~FaviconService();
 
-  // Callback for GetFavicon. If we have previously inquired about the favicon
-  // for this URL, |know_favicon| will be true, and the rest of the fields will
-  // be valid (otherwise they will be ignored).
+  // Callback for GetFaviconImage() and GetFaviconImageForURL().
+  // |FaviconImageResult::image| is constructed from the bitmaps for the
+  // passed in URL and icon types which most which closely match the passed in
+  // |desired_size_in_dip| at the scale factors supported by the current
+  // platform (eg MacOS).
+  // |FaviconImageResult::icon_url| is the favicon that the favicon bitmaps in
+  // |image| originate from.
+  // TODO(pkotwicz): Enable constructing |image| from bitmaps from several
+  // icon URLs.
+  typedef base::Callback<void(Handle, const history::FaviconImageResult&)>
+      FaviconImageCallback;
+
+  // Callback for GetRawFavicon() and GetRawFaviconForURL().
+  // FaviconBitmapResult::bitmap_data is the bitmap in the thumbnail database
+  // for the passed in URL and icon types whose pixel size best matches the
+  // passed in |desired_size_in_dip| and |desired_scale_factor|. Returns an
+  // invalid history::FaviconBitmapResult if there are no matches.
+  typedef base::Callback<void(Handle, const history::FaviconBitmapResult&)>
+      FaviconRawCallback;
+
+  // Callback for GetFavicon() and GetFaviconForURL().
   //
-  // On |know_favicon| == true, |data| will either contain the PNG encoded
-  // favicon data, or it will be NULL to indicate that the site does not have
-  // a favicon (in other words, we know the site doesn't have a favicon, as
-  // opposed to not knowing anything). |expired| will be set to true if we
-  // refreshed the favicon "too long" ago and should be updated if the page
-  // is visited again.
+  // The second argument is the set of bitmaps for the passed in URL and
+  // icon types whose pixel sizes best match the passed in
+  // |desired_size_in_dip| and |desired_scale_factors|. The vector has at most
+  // one result for each of |desired_scale_factors|. There are less entries if
+  // a single result is the best bitmap to use for several scale factors.
+  //
+  // Third argument:
+  // a) If the callback is called as a result of GetFaviconForURL():
+  //    The third argument is a map of the icon URLs mapped to |page_url| to
+  //    the sizes at which the favicon is available from the web.
+  // b) If the callback is called as a result of GetFavicon() or
+  //    UpdateFaviconMappingAndFetch():
+  //    The third argument is a map with a single element with the passed in
+  //    |icon_url| to the vector of sizes of the favicon bitmaps at that URL. If
+  //    |icon_url| is not known to the history backend, an empty map is
+  //    returned.
+  // See history_types.h for more information about IconURLSizesMap.
   typedef base::Callback<
       void(Handle,  // handle
-           history::FaviconData)>  // the type of favicon
-      FaviconDataCallback;
+           std::vector<history::FaviconBitmapResult>,
+           history::IconURLSizesMap)>
+      FaviconResultsCallback;
 
-  typedef CancelableRequest<FaviconDataCallback> GetFaviconRequest;
+  typedef CancelableRequest<FaviconResultsCallback> GetFaviconRequest;
 
-  // Requests the |icon_type| of favicon. |consumer| is notified when the bits
-  // have been fetched. |icon_url| is the URL of the icon itself, e.g.
+  // Requests the favicon at |icon_url| of |icon_type| whose size most closely
+  // matches |desired_size_in_dip|. |consumer| is notified when the bits have
+  // been fetched. |icon_url| is the URL of the icon itself, e.g.
   // <http://www.google.com/favicon.ico>.
+  // Each of the three methods below differs in the format of the callback and
+  // the requested scale factors. All of the scale factors supported by the
+  // current platform (eg MacOS) are requested for GetFaviconImage().
+  Handle GetFaviconImage(const GURL& icon_url,
+                         history::IconType icon_type,
+                         int desired_size_in_dip,
+                         CancelableRequestConsumerBase* consumer,
+                         const FaviconImageCallback& callback);
+
+  Handle GetRawFavicon(const GURL& icon_url,
+                       history::IconType icon_type,
+                       int desired_size_in_dip,
+                       ui::ScaleFactor desired_scale_factor,
+                       CancelableRequestConsumerBase* consumer,
+                       const FaviconRawCallback& callback);
+
   Handle GetFavicon(const GURL& icon_url,
                     history::IconType icon_type,
+                    int desired_size_in_dip,
+                    const std::vector<ui::ScaleFactor>& desired_scale_factors,
                     CancelableRequestConsumerBase* consumer,
-                    const FaviconDataCallback& callback);
+                    const FaviconResultsCallback& callback);
 
   // Fetches the |icon_type| of favicon at |icon_url|, sending the results to
   // the given |callback|. If the favicon has previously been set via
@@ -64,27 +114,49 @@ class FaviconService : public CancelableRequestProvider,
                                       const GURL& icon_url,
                                       history::IconType icon_type,
                                       CancelableRequestConsumerBase* consumer,
-                                      const FaviconDataCallback& callback);
-
-  // Requests any |icon_types| of favicon for a web page URL. |consumer| is
-  // notified when the bits have been fetched. |icon_types| can be any
-  // combination of IconType value, but only one icon will be returned in the
-  // priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON and FAVICON.
-  //
-  // Note: this version is intended to be used to retrieve the favicon of a
-  // page that has been browsed in the past. |expired| in the callback is
-  // always false.
-  Handle GetFaviconForURL(Profile* profile,
-                          const GURL& page_url,
-                          int icon_types,
-                          CancelableRequestConsumerBase* consumer,
-                          const FaviconDataCallback& callback);
-
-  // Requests the favicon for |favicon_id|. The |consumer| is notified when the
-  // bits have been fetched.
-  Handle GetFaviconForID(history::FaviconID favicon_id,
-                         CancelableRequestConsumerBase* consumer,
-                         const FaviconDataCallback& callback);
+                                      const FaviconResultsCallback& callback);
+
+  // Requests the favicons of any of |icon_types| whose pixel sizes most
+  // closely match |desired_size_in_dip| and desired scale factors for a web
+  // page URL. |consumer| is notified when the bits have been fetched.
+  // |icon_types| can be any combination of IconType value, but only one icon
+  // will be returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON
+  // and FAVICON. Each of the three methods below differs in the format of the
+  // callback and the requested scale factors. All of the scale factors
+  // supported by the current platform (eg MacOS) are requested for
+  // GetFaviconImageForURL().
+  Handle GetFaviconImageForURL(Profile* profile,
+                               const GURL& page_url,
+                               int icon_types,
+                               int desired_size_in_dip,
+                               CancelableRequestConsumerBase* consumer,
+                               const FaviconImageCallback& callback);
+
+  Handle GetRawFaviconForURL(Profile* profile,
+                             const GURL& page_url,
+                             int icon_types,
+                             int desired_size_in_dip,
+                             ui::ScaleFactor desired_scale_factor,
+                             CancelableRequestConsumerBase* consumer,
+                             const FaviconRawCallback& callback);
+
+  Handle GetFaviconForURL(
+      Profile* profile,
+      const GURL& page_url,
+      int icon_types,
+      int desired_size_in_dip,
+      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      CancelableRequestConsumerBase* consumer,
+      const FaviconResultsCallback& callback);
+
+  // Requests the favicon for |favicon_id| which most closely matches
+  // |desired_size_in_dip| and |desired_scale_factor|. The |consumer| is
+  // notified when the bits have been fetched.
+  Handle GetRawFaviconForID(history::FaviconID favicon_id,
+                            int desired_size_in_dip,
+                            ui::ScaleFactor desired_scale_factor,
+                            CancelableRequestConsumerBase* consumer,
+                            const FaviconRawCallback& callback);

[michaelbai, 2012/08/31 21:41:14]

I don't understand this method, Is favicon_id the unique ID of a favicon?

If I request a specific favicon by ID, what's the purpose of desired_size_in_dip
and desired_scale_factor? 

 
   // Marks all types of favicon for the page as being out of date.
   void SetFaviconOutOfDateForPage(const GURL& page_url);
@@ -114,6 +186,39 @@ class FaviconService : public CancelableRequestProvider,
   // Helper to forward an empty result if we cannot get the history service.
   void ForwardEmptyResultAsync(GetFaviconRequest* request);
 
+  // Helper function for GetFaviconImageForURL(), GetRawFaviconForURL() and
+  // GetFaviconForURL().
+  Handle GetFaviconForURLImpl(
+      Profile* profile,
+      const GURL& page_url,
+      int icon_types,
+      int desired_size_in_dip,
+      const std::vector<ui::ScaleFactor>& desired_scale_factors,
+      CancelableRequestConsumerBase* consumer,
+      GetFaviconRequest* request);
+
+  // Intermediate callback for GetFaviconImage() and GetFaviconImageForURL()
+  // so that history service can deal solely with FaviconResultsCallback.
+  // Builds history::FaviconImageResult from |favicon_bitmap_results| and runs
+  // |callback|.
+  void GetFaviconImageCallback(
+      int desired_size_in_dip,
+      FaviconImageCallback callback,
+      Handle handle,
+      std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
+      history::IconURLSizesMap icon_url_sizes_map);
+
+  // Intermediate callback for GetRawFavicon() and GetRawFaviconForURL()
+  // so that history service can deal solely with FaviconResultsCallback.
+  // Resizes history::FaviconBitmapResult if necessary and runs |callback|.
+  void 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);
+
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };