Changes favicon database to support storing bitmaps of different sizes for the same icon_url

chrome/browser/history/history_backend.cc

 // 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.
 
 #include "chrome/browser/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 1777 matching lines @@
 void HistoryBackend::SetFaviconOutOfDateForPage(const GURL& page_url) {
   std::vector<IconMapping> icon_mappings;
 
   if (!thumbnail_db_.get() ||
       !thumbnail_db_->GetIconMappingsForPageURL(page_url,
                                                 &icon_mappings))
     return;
 
   for (std::vector<IconMapping>::iterator m = icon_mappings.begin();
        m != icon_mappings.end(); ++m) {
-    thumbnail_db_->SetFaviconLastUpdateTime(m->icon_id, Time());
+    thumbnail_db_->SetFaviconOutOfDate(m->icon_id);
   }
   ScheduleCommit();
 }
 
 void HistoryBackend::CloneFavicon(const GURL& old_page_url,
                                   const GURL& new_page_url) {
   if (!thumbnail_db_.get())
     return;
 
   // Prevent cross-domain cloning.
@@ skipping 16 matching lines @@
 
   for (size_t i = 0; i < favicon_usage.size(); i++) {
     FaviconID favicon_id = thumbnail_db_->GetFaviconIDForFaviconURL(
         favicon_usage[i].favicon_url, history::FAVICON, NULL);
     if (!favicon_id) {
       // This favicon doesn't exist yet, so we create it using the given data.
       favicon_id = thumbnail_db_->AddFavicon(favicon_usage[i].favicon_url,
                                              history::FAVICON);
       if (!favicon_id)
         continue;  // Unable to add the favicon.
-      thumbnail_db_->SetFavicon(favicon_id,
+      thumbnail_db_->AddFaviconFrame(favicon_id,
           new base::RefCountedBytes(favicon_usage[i].png_data), now);
     }
 
     // Save the mapping from all the URLs to the favicon.
     BookmarkService* bookmark_service = GetBookmarkService();
     for (std::set<GURL>::const_iterator url = favicon_usage[i].urls.begin();
          url != favicon_usage[i].urls.end(); ++url) {
       URLRow url_row;
       if (!db_->GetRowForURL(*url, &url_row)) {
         // If the URL is present as a bookmark, add the url in history to
@@ skipping 102 matching lines @@
   DCHECK(data.get());
   if (!thumbnail_db_.get() || !db_.get())
     return;
 
   FaviconID id = thumbnail_db_->GetFaviconIDForFaviconURL(
       icon_url, icon_type, NULL);
   if (!id)
     id = thumbnail_db_->AddFavicon(icon_url, icon_type);
 
   // Set the image data.
-  thumbnail_db_->SetFavicon(id, data, Time::Now());
+  thumbnail_db_->AddFaviconFrame(id, data, Time::Now());
 
   SetFaviconMapping(page_url, id, icon_type);
 }
 
 void HistoryBackend::SetFaviconMapping(const GURL& page_url,
                                        FaviconID id,
                                        IconType icon_type) {
   if (!thumbnail_db_.get())
     return;
 
@@ skipping 358 matching lines @@
 bool HistoryBackend::ClearAllThumbnailHistory(URLRows* kept_urls) {
   if (!thumbnail_db_.get()) {
     // When we have no reference to the thumbnail database, maybe there was an
     // error opening it. In this case, we just try to blow it away to try to
     // fix the error if it exists. This may fail, in which case either the
     // file doesn't exist or there's no more we can do.
     file_util::Delete(GetThumbnailFileName(), false);
     return true;
   }
 
-  // Create the duplicate favicon table, this is where the favicons we want
-  // to keep will be stored.
+  // Create duplicate favicon and favicon frames tables, this is where the
+  // favicons we want to keep will be stored.
+  if (!thumbnail_db_->InitTemporaryFaviconFramesTable())

[sky, 2012/08/02 19:50:31]

I think it less error prone and easier to maintain if ThumbnailDatabase exposes
a single InitTemporaryTables method that takes care of all the necessary tables.

+    return false;
+
   if (!thumbnail_db_->InitTemporaryFaviconsTable())
     return false;
 
   if (!thumbnail_db_->InitTemporaryIconMappingTable())
     return false;
 
   // This maps existing favicon IDs to the ones in the temporary table.
   typedef std::map<FaviconID, FaviconID> FaviconMap;
   FaviconMap copied_favicons;
 
   // Copy all unique favicons to the temporary table, and update all the
   // URLs to have the new IDs.
   for (URLRows::iterator i = kept_urls->begin(); i != kept_urls->end(); ++i) {
     std::vector<IconMapping> icon_mappings;
     if (!thumbnail_db_->GetIconMappingsForPageURL(i->url(), &icon_mappings))
       continue;
 
     for (std::vector<IconMapping>::iterator m = icon_mappings.begin();
          m != icon_mappings.end(); ++m) {
       FaviconID old_id = m->icon_id;
       FaviconID new_id;
       FaviconMap::const_iterator found = copied_favicons.find(old_id);
       if (found == copied_favicons.end()) {
         new_id = thumbnail_db_->CopyToTemporaryFaviconTable(old_id);
+        thumbnail_db_->CopyToTemporaryFaviconFramesTable(old_id);
         copied_favicons[old_id] = new_id;
       } else {
         // We already encountered a URL that used this favicon, use the ID we
         // previously got.
         new_id = found->second;
       }
       // Add Icon mapping, and we don't care wheteher it suceeded or not.
       thumbnail_db_->AddToTemporaryIconMappingTable(i->url(), new_id);
     }
   }
 #if defined(OS_ANDROID)
   // TODO (michaelbai): Add the unit test once AndroidProviderBackend is
   // avaliable in HistoryBackend.
   db_->ClearAndroidURLRows();
 #endif
 
-  // Rename the duplicate favicon and icon_mapping back table and recreate the
-  // other tables. This will make the database consistent again.
+  // Drop original favicon_frames, favicons, and icon mappings tables and
+  // replace them with the duplicate tables. Recreate the other tables. This
+  // will make the database consistent again.
+  thumbnail_db_->CommitTemporaryFaviconFrameTable();
   thumbnail_db_->CommitTemporaryFaviconTable();
   thumbnail_db_->CommitTemporaryIconMappingTable();
 
   thumbnail_db_->RecreateThumbnailTable();
 
   // Vacuum to remove all the pages associated with the dropped tables. There
   // must be no transaction open on the table when we do this. We assume that
   // our long-running transaction is open, so we complete it and start it again.
   DCHECK(thumbnail_db_->transaction_nesting() == 1);
   thumbnail_db_->CommitTransaction();
@@ skipping 93 matching lines @@
   info.url_id = visit.url_id;
   info.time = visit.visit_time;
   info.transition = visit.transition;
   // If we don't have a delegate yet during setup or shutdown, we will drop
   // these notifications.
   if (delegate_.get())
     delegate_->NotifyVisitDBObserversOnAddVisit(info);
 }
 
 }  // namespace history