Adds support for saving favicon size into history database.

chrome/browser/history/history.h

Index: chrome/browser/history/history.h
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index 20a7ec1084248b63c71c59ae1880440b22032bfd..270cc10983daaf91b4b76617ff430facc1498de7 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -25,6 +25,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
 #include "sql/init_status.h"
+#include "ui/base/layout.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/history/android/android_history_provider_service.h"
@@ -689,34 +690,113 @@ class HistoryService : public CancelableRequestProvider,
   // these methods directly you should call the respective method on the
   // FaviconService.
 
-  // Used by the FaviconService to get a favicon from the history backend.
-  void GetFavicon(FaviconService::GetFaviconRequest* request,
-                  const GURL& icon_url,
-                  history::IconType icon_type);
-
-  // Used by the FaviconService to update the favicon mappings on the history
-  // backend.
-  void UpdateFaviconMappingAndFetch(FaviconService::GetFaviconRequest* request,
-                                    const GURL& page_url,
-                                    const GURL& icon_url,
-                                    history::IconType icon_type);
-
-  // Used by the FaviconService to get a favicon from the history backend.
-  void GetFaviconForURL(FaviconService::GetFaviconRequest* request,
-                        const GURL& page_url,
-                        int icon_types);
-
-  // Used by the FaviconService to get a favicon from the history backend.
+  // Used by FaviconService to get the favicon bitmaps from the history backend
+  // which most closely match |desired_size_in_dip| x |desired_size_in_dip| and
+  // |desired_scale_factors| for |icon_types|. The returned FaviconBitmapResults
+  // will have at most one result for each of |desired_scale_factors|. If a
+  // favicon bitmap is determined to be the best candidate for multiple scale
+  // factors there will be less results.
+  // If |icon_types| has several types, results for only a single type will be
+  // returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and
+  // FAVICON. |icon_types| can only have multiple IconTypes if
+  // |icon_types| == TOUCH_ICON | TOUCH_PRECOMPOSED_ICON.
+  void GetFavicons(FaviconService::GetFaviconRequest* request,
+                   const std::vector<GURL>& icon_urls,
+                   int icon_types,
+                   int desired_size_in_dip,
+                   const std::vector<ui::ScaleFactor>& desired_scale_factors);
+
+  // Used by the FaviconService to get favicons mapped to |page_url| for
+  // |icon_types| which most closely match |desired_size_in_dip| and
+  // |desired_scale_factors|. The returned FaviconBitmapResults will have
+  // at most one result for each of |desired_scale_factors|. If a favicon
+  // bitmap is determined to be the best candidate for multiple scale factors
+  // there will be less results.
+  // If |icon_types| has several types, results for only a single type will be
+  // returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and
+  // FAVICON.
+  void GetFaviconsForURL(
+      FaviconService::GetFaviconRequest* request,
+      const GURL& page_url,
+      int icon_types,
+      int desired_size_in_dip,
+      const std::vector<ui::ScaleFactor>& desired_scale_factors);
+
+  // Used by the FaviconService to get the favicon bitmap which most closely
+  // matches |desired_size_in_dip| and |desired_scale_factor| from the favicon
+  // at |id| from the history backend.
   void GetFaviconForID(FaviconService::GetFaviconRequest* request,
-                       history::FaviconID id);
+                       history::FaviconID id,
+                       int desired_size_in_dip,
+                       ui::ScaleFactor desired_scale_factor);
+
+  // Used by the FaviconService to replace the favicon mappings to |page_url|
+  // for |icon_types| on the history backend.
+  // 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| by 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 set only 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|
+  // and |desired_scale_factors| from the favicons which were just mapped
+  // to |page_url| are returned.
+  void UpdateFaviconMappingsAndFetch(
+      FaviconService::GetFaviconRequest* request,
+      const GURL& page_url,
+      const std::vector<GURL>& icon_urls,
+      int icon_types,
+      int desired_size_in_dip,
+      const std::vector<ui::ScaleFactor>& desired_scale_factors);
+
+  // Used by the FaviconService to set a favicon for |page_url| at |icon_url|.
+  // The favicon will only be set if |icon_url| and |pixel_size| are consistent
+  // with the database's knowledge of the icons mapped to |page_url| and the
+  // sizes of the favicon bitmaps at |icon_url|.
+  // If neither |page_url| nor |icon_url| are known to the database, the favicon
+  // is added with an empty size such that the icon is fetched from the web
+  // when |page_url| is visited.
+  // TODO(pkotwicz): Remove this function once it is no longer required by
+  // sync.
+  void MergeFavicon(

[sky, 2012/09/04 20:52:29]

I don't understand the use case for this, and especially the need to verify the
size. Could you explain that?

[pkotwicz, 2012/09/04 22:40:54]

The use case for this is sync to use this function instead of SetFavicons in
bookmark_change_processor.cc
Imagine a user who has two devices.
a) Windows machine.
b) Retina macbook.
Sync syncs only 16x16 bitmaps.
The idea is that sync updates from the Windows box don't delete 2x bitmaps from
the history backend on the retina macbook.

+      const GURL& page_url,
+      const GURL& icon_url,
+      history::IconType icon_type,
+      scoped_refptr<base::RefCountedMemory> bitmap_data,
+      const gfx::Size& pixel_size);
+
+  // Used by the FaviconService to set the favicons for a page on the history
+  // backend.
+  // |favicon_bitmap_data| is a listing of additional favicon bitmaps to store
+  // for |page_url|.
+  // |icon_url_sizes| is a mapping of all the icon urls of favicons available
+  // for |page_url| to the sizes that those favicons are available from the web.
+  // |favicon_bitmap_data| does not need to have entries for all the icon urls
+  // or sizes listed in |icon_url_sizes|. However, the icon urls and favicon
+  // sizes in |favicon_bitmap_data| must be a subset of |icon_url_sizes|. It is
+  // important that |icon_url_sizes| be complete as mappings to favicons whose
+  // icon url or pixel size is not in |icon_url_sizes| will be deleted.
+  // |expired| and |icon_type| fields in FaviconBitmapData are ignored.
+  void SetFavicons(
+      const GURL& page_url,
+      history::IconType icon_type,
+      const std::vector<history::FaviconBitmapData>& favicon_bitmap_data,
+      const history::IconURLSizesMap& icon_url_sizes);
 
   // Used by the FaviconService to mark the favicon for the page as being out
   // of date.
-  void SetFaviconOutOfDateForPage(const GURL& page_url);
+  void SetFaviconsOutOfDateForPage(const GURL& page_url);
 
   // Used by the FaviconService to clone favicons from one page to another,
   // provided that other page does not already have favicons.
-  void CloneFavicon(const GURL& old_page_url, const GURL& new_page_url);
+  void CloneFavicons(const GURL& old_page_url, const GURL& new_page_url);
 
   // Used by the FaviconService for importing many favicons for many pages at
   // once. The pages must exist, any favicon sets for unknown pages will be
@@ -724,14 +804,6 @@ class HistoryService : public CancelableRequestProvider,
   void SetImportedFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicon_usage);
 
-  // Used by the FaviconService to set the favicon for a page on the history
-  // backend.
-  void SetFavicon(const GURL& page_url,
-                  const GURL& icon_url,
-                  const std::vector<unsigned char>& image_data,
-                  history::IconType icon_type);
-
-
   // Sets the in-memory URL database. This is called by the backend once the
   // database is loaded to make it available.
   void SetInMemoryBackend(int backend_id,
@@ -848,6 +920,33 @@ class HistoryService : public CancelableRequestProvider,
     return request->handle();
   }
 
+  template<typename BackendFunc,
+           class RequestType,  // Descendant of CancelableRequstBase.
+           typename ArgA,
+           typename ArgB,
+           typename ArgC,
+           typename ArgD,
+           typename ArgE>
+  Handle Schedule(SchedulePriority priority,
+                  BackendFunc func,  // Function to call on the HistoryBackend.
+                  CancelableRequestConsumerBase* consumer,
+                  RequestType* request,
+                  const ArgA& a,
+                  const ArgB& b,
+                  const ArgC& c,
+                  const ArgD& d,
+                  const ArgE& e) {
+    DCHECK(thread_) << "History service being called after cleanup";
+    LoadBackendIfNecessary();
+    if (consumer)
+      AddRequest(request, consumer);
+    ScheduleTask(priority,
+                 base::Bind(func, history_backend_.get(),
+                                   scoped_refptr<RequestType>(request),
+                                   a, b, c, d, e));
+    return request->handle();
+  }
+
   // ScheduleAndForget ---------------------------------------------------------
   //
   // Functions for scheduling operations on the history thread that do not need
@@ -908,6 +1007,25 @@ class HistoryService : public CancelableRequestProvider,
                                       a, b, c, d));
   }
 
+  template<typename BackendFunc,
+           typename ArgA,
+           typename ArgB,
+           typename ArgC,
+           typename ArgD,
+           typename ArgE>
+  void ScheduleAndForget(SchedulePriority priority,
+                         BackendFunc func,  // Function to call on backend.
+                         const ArgA& a,
+                         const ArgB& b,
+                         const ArgC& c,
+                         const ArgD& d,
+                         const ArgE& e) {
+    DCHECK(thread_) << "History service being called after cleanup";
+    LoadBackendIfNecessary();
+    ScheduleTask(priority, base::Bind(func, history_backend_.get(),
+                                      a, b, c, d, e));
+  }
+
   content::NotificationRegistrar registrar_;
 
   // Some void primitives require some internal processing in the main thread