Adds support for saving favicon size into history database.

chrome/browser/history/history_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 22 matching lines @@
 }
 
 namespace history {
 #if defined(OS_ANDROID)
 class AndroidProviderBackend;
 #endif
 class CommitLaterTask;
 class HistoryPublisher;
 class VisitFilter;
 
+// The maximum number of favicon bitmaps stored for a single page.
+// Exposed for use in unittests.
+extern const size_t kMaxFaviconsPerPage;
+
 // *See the .cc file for more information on the design.*
 //
 // Internal history implementation which does most of the work of the history
 // system. This runs on a background thread (to not block the browser when we
 // do expensive operations) and is NOT threadsafe, so it must only be called
 // from message handlers on the background thread. Invoking on another thread
 // requires threadsafe refcounting.
 //
 // Most functions here are just the implementations of the corresponding
 // functions in the history service. These functions are not documented
@@ skipping 190 matching lines @@
   void GetPageThumbnailDirectly(
       const GURL& page_url,
       scoped_refptr<base::RefCountedBytes>* data);
 
   void MigrateThumbnailsDatabase();
 
   // Favicon -------------------------------------------------------------------
 
   void GetFavicon(scoped_refptr<GetFaviconRequest> request,
                   const GURL& icon_url,
+                  const gfx::Size& pixel_size,
                   int icon_types);
 
   void GetFaviconForURL(scoped_refptr<GetFaviconRequest> request,
                         const GURL& page_url,
+                        const gfx::Size& pixel_size,
                         int icon_types);
 
   void GetFaviconForID(scoped_refptr<GetFaviconRequest> request, FaviconID id);
 
   void SetFavicon(const GURL& page_url,
                   const GURL& icon_url,
                   scoped_refptr<base::RefCountedMemory> data,
+                  const gfx::Size& pixel_size,
                   IconType icon_type);
 
   void UpdateFaviconMappingAndFetch(scoped_refptr<GetFaviconRequest> request,
                                     const GURL& page_url,
                                     const GURL& icon_url,
+                                    const gfx::Size& pixel_size,
                                     IconType icon_type);
 
   void SetFaviconOutOfDateForPage(const GURL& page_url);
 
   void CloneFavicon(const GURL& old_page_url, const GURL& new_page_url);
 
   void SetImportedFavicons(
       const std::vector<ImportedFaviconUsage>& favicon_usage);
 
   // Downloads -----------------------------------------------------------------
@@ skipping 178 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, StripUsernamePasswordTest);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, DeleteThumbnailsDatabaseTest);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, AddPageVisitSource);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, AddPageArgsSource);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, AddVisitsSource);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, RemoveVisitsSource);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, RemoveVisitsTransitions);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, MigrationVisitSource);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, MigrationIconMapping);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, SetFaviconMapping);
+  FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, ExceedPageFaviconLimit);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, AddOrUpdateIconMapping);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, GetMostRecentVisits);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, GetFaviconForURL);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest,
                            CloneFaviconIsRestrictedToSameDomain);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, QueryFilteredURLs);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, UpdateVisitDuration);
 
   friend class ::TestingProfile;
 
@@ skipping 103 matching lines @@
 
   // Used by both UpdateFaviconMappingAndFetch and GetFavicon.
   // If page_url is non-null and SetFavicon has previously been invoked for
   // icon_url the favicon url for page_url (and all redirects) is set to
   // icon_url.
   // Only a single type can be given in icon_type when page_url is specified.
   void UpdateFaviconMappingAndFetchImpl(
       const GURL* page_url,
       const GURL& icon_url,
       scoped_refptr<GetFaviconRequest> request,
+      const gfx::Size& requested_size,
       int icon_type);
 
+  // Returns the FaviconID from |favicon_id_size_listing| whose size most
+  // closely matches |desired_pixel_size|.
+  FaviconID GetFaviconID(
+    const std::vector<FaviconIDAndSize>& favicon_id_size_listing,
+    const gfx::Size& desired_pixel_size) const;
+
   // Sets the favicon url id for page_url to id. This will also broadcast
   // notifications as necessary.
   void SetFaviconMapping(const GURL& page_url,
                          FaviconID id,
+                         const gfx::Size& pixel_size,
                          IconType icon_type);
 
   // Updates the FaviconID associated with the url of a page. If there is an
   // existing mapping between |page_url| and |id| this does nothing and returns
   // false. If the mapping needs to be added or updated, true is returned. If
   // there is an existing mapping but it does not map to |id|, then the |id| of
   // the replaced FaviconID is set in |replaced_icon_id|.
   bool AddOrUpdateIconMapping(const GURL& page_url,
                               FaviconID id,
+                              const gfx::Size& pixel_size,
                               IconType icon_type,
                               FaviconID* replaced_icon_id);
 
   // Generic stuff -------------------------------------------------------------
 
   // Processes the next scheduled HistoryDBTask, scheduling this method
   // to be invoked again if there are more tasks that need to run.
   void ProcessDBTaskImpl();
 
   // Release all tasks in history_db_tasks_ and clears it.
@@ skipping 28 matching lines @@
   // The IDs of the URLs may change.
   bool ClearAllMainHistory(const URLRows& kept_urls);
 
   // Returns the BookmarkService, blocking until it is loaded. This may return
   // NULL during testing.
   BookmarkService* GetBookmarkService();
 
   // If there is a favicon for |page_url| and one of the types in |icon_types|,
   // |favicon| is set appropriately and true is returned.
   bool GetFaviconFromDB(const GURL& page_url,
+                        const gfx::Size& pixel_size,
                         int icon_types,
                         FaviconData* favicon);
 
-  // Get favicon by the given |favicon_id|, the |favicon| is set appropriately
-  // and true if returned on success, otherwise false is returned.
+  // Get favicon by the given |favicon_id|. The |favicon| is set appropriately.
+  // Returns true on success.
   bool GetFaviconFromDB(FaviconID favicon_id, FaviconData* favicon);
 
   // Notify any observers of an addition to the visit database.
   void NotifyVisitObservers(const VisitRow& visit);
 
   // Data ----------------------------------------------------------------------
 
   // Delegate. See the class definition above for more information. This will
   // be NULL before Init is called and after Cleanup, but is guaranteed
   // non-NULL in between.
@@ skipping 87 matching lines @@
   // Used to provide the Android ContentProvider APIs.
   scoped_ptr<AndroidProviderBackend> android_provider_backend_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_