Adds support for saving favicon size into history database.

chrome/browser/history/thumbnail_database.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/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
 
 
 
 static void FillIconMapping(const sql::Statement& statement,
                             const GURL& page_url,
                             history::IconMapping* icon_mapping) {
   icon_mapping->mapping_id = statement.ColumnInt64(0);
   icon_mapping->icon_id = statement.ColumnInt64(1);
   icon_mapping->icon_type =
       static_cast<history::IconType>(statement.ColumnInt(2));
+  icon_mapping->icon_url = GURL(statement.ColumnString(3));
   icon_mapping->page_url = page_url;
 }
 
 namespace history {
 
 // Version number of the database.
 static const int kCurrentVersionNumber = 6;
 static const int kCompatibleVersionNumber = 6;
 
 // Use 90 quality (out of 100) which is pretty high, because we're very
 // sensitive to artifacts for these small sized, highly detailed images.
 static const int kImageQuality = 90;
 
 ThumbnailDatabase::IconMappingEnumerator::IconMappingEnumerator() {
 }
 
 ThumbnailDatabase::IconMappingEnumerator::~IconMappingEnumerator() {
 }
 
 bool ThumbnailDatabase::IconMappingEnumerator::GetNextIconMapping(
     IconMapping* icon_mapping) {
   if (!statement_.Step())
     return false;
-  FillIconMapping(statement_, GURL(statement_.ColumnString(3)), icon_mapping);
+  FillIconMapping(statement_, GURL(statement_.ColumnString(4)), icon_mapping);
   return true;
 }
 
 ThumbnailDatabase::ThumbnailDatabase()
     : history_publisher_(NULL),
       use_top_sites_(false) {
 }
 
 sql::InitStatus ThumbnailDatabase::CantUpgradeToVersion(int cur_version) {
   LOG(WARNING) << "Unable to update to thumbnail database to version " <<
@@ skipping 323 matching lines @@
   double current_boring_score = select_statement.ColumnDouble(0);
   bool current_clipping = select_statement.ColumnBool(1);
   bool current_at_top = select_statement.ColumnBool(2);
   base::Time last_updated =
       base::Time::FromTimeT(select_statement.ColumnInt64(3));
   *score = ThumbnailScore(current_boring_score, current_clipping,
                           current_at_top, last_updated);
   return true;
 }
 
+bool ThumbnailDatabase::GetFaviconBitmapIDSizeListing(
+    FaviconID icon_id,
+    std::vector<FaviconBitmapIDSize>* bitmap_id_size_listing) {
+  DCHECK(icon_id);
+  sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
+      "SELECT id, width, height FROM favicon_bitmaps WHERE icon_id=?"));
+  statement.BindInt64(0, icon_id);
+
+  while (statement.Step()) {
+    FaviconBitmapIDSize bitmap_id_size;
+    bitmap_id_size.bitmap_id = statement.ColumnInt(0);
+    bitmap_id_size.pixel_size = gfx::Size(statement.ColumnInt(1),
+                                          statement.ColumnInt(2));
+    bitmap_id_size_listing->push_back(bitmap_id_size);
+  }
+  return !bitmap_id_size_listing->empty();

[sky, 2012/08/21 20:16:56]

In this one you return whether non-empty, but not in GetFaviconBitmaps. I has
asked GetFaviconBitmaps to look like this last review and you didn't change it.
How come you're not making this one match that pattern? I think what you have
here is the right pattern and GetFaviconBitmaps should change.

+}
+
 bool ThumbnailDatabase::GetFaviconBitmaps(
     FaviconID icon_id,
     std::vector<FaviconBitmap>* favicon_bitmaps) {
   DCHECK(icon_id);
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, last_updated, image_data, width, height FROM favicon_bitmaps "
       "WHERE icon_id=?"));
   statement.BindInt64(0, icon_id);
 
   bool result = false;
@@ skipping 37 matching lines @@
   }
   statement.BindInt64(2, time.ToTimeT());
   statement.BindInt(3, pixel_size.width());
   statement.BindInt(4, pixel_size.height());
 
   if (!statement.Run())
     return 0;
   return db_.GetLastInsertRowId();
 }
 
-bool ThumbnailDatabase::DeleteFaviconBitmapsForFavicon(FaviconID icon_id) {
+bool ThumbnailDatabase::SetFaviconBitmap(
+    FaviconBitmapID bitmap_id,
+    scoped_refptr<base::RefCountedMemory> icon_data,

[sky, 2012/08/21 20:16:56]

Shouldn't this take the size too?

[pkotwicz, 2012/09/04 16:18:36]

In my opinion a favicon bitmap is uniquely identified by the FaviconID it is
associated with and it's pixel size.
So if the pixel size or FaviconID changes, we would add a new FaviconBitmap and
delete the old one as opposed to setting it.

+    base::Time time) {
+  DCHECK(bitmap_id);
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
-      "DELETE FROM favicon_bitmaps WHERE icon_id=?"));
-  statement.BindInt64(0, icon_id);
+      "UPDATE favicon_bitmaps SET image_data=?, last_updated=? WHERE id=?"));
+  if (icon_data.get() && icon_data->size()) {
+    statement.BindBlob(0, icon_data->front(),
+                       static_cast<int>(icon_data->size()));
+  } else {
+    statement.BindNull(0);
+  }
+  statement.BindInt64(1, time.ToTimeT());
+  statement.BindInt64(2, bitmap_id);
+
   return statement.Run();
 }
 
+bool ThumbnailDatabase::DeleteFaviconBitmap(FaviconBitmapID bitmap_id) {
+  sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
+      "DELETE FROM favicon_bitmaps WHERE id=?"));
+  statement.BindInt64(0, bitmap_id);
+  return statement.Run();
+}
+
 bool ThumbnailDatabase::SetFaviconSizes(FaviconID icon_id,
                                         const std::string& sizes) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "UPDATE favicons SET sizes=? WHERE id=?"));
   statement.BindString(0, sizes);
   statement.BindInt64(1, icon_id);
 
   return statement.Run();
 }
 
 bool ThumbnailDatabase::SetFaviconOutOfDate(FaviconID icon_id) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "UPDATE favicon_bitmaps SET last_updated=? WHERE icon_id=?"));
   statement.BindInt64(0, 0);
   statement.BindInt64(1, icon_id);
 
   return statement.Run();
 }
 
 FaviconID ThumbnailDatabase::GetFaviconIDForFaviconURL(const GURL& icon_url,
-                                                       int required_icon_type,
-                                                       IconType* icon_type) {
+                                                       int required_icon_type) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
-      "SELECT id, icon_type FROM favicons WHERE url=? AND (icon_type & ? > 0) "
+      "SELECT id FROM favicons WHERE url=? AND (icon_type & ? > 0) "
       "ORDER BY icon_type DESC"));
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(icon_url));
   statement.BindInt(1, required_icon_type);
 
   if (!statement.Step())
     return 0;  // not cached
-
-  if (icon_type)
-    *icon_type = static_cast<IconType>(statement.ColumnInt(1));
   return statement.ColumnInt64(0);
 }
 
-bool ThumbnailDatabase::GetFavicon(
-    FaviconID icon_id,
-    base::Time* last_updated,
-    scoped_refptr<base::RefCountedMemory>* png_icon_data,
-    GURL* icon_url,
-    IconType* icon_type) {
-  DCHECK(icon_id);
-
-  std::vector<FaviconBitmap> favicon_bitmaps;
-  if (!GetFaviconBitmaps(icon_id, &favicon_bitmaps))
-    return false;
-
-  if (favicon_bitmaps.empty())
-    return false;
-
-  if (last_updated)
-    *last_updated = favicon_bitmaps[0].last_updated;
-
-  *png_icon_data = favicon_bitmaps[0].bitmap_data;
-
-  return GetFaviconHeader(icon_id, icon_url, icon_type, NULL);
-}
-
 bool ThumbnailDatabase::GetFaviconHeader(
     FaviconID icon_id,
     GURL* icon_url,
     IconType* icon_type,
     std::string* sizes) {
   DCHECK(icon_id);
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT url, icon_type, sizes FROM favicons WHERE id=?"));
   statement.BindInt64(0, icon_id);
@@ skipping 47 matching lines @@
   statement.BindInt64(0, id);
   if (!statement.Run())
     return false;
 
   statement.Assign(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM favicon_bitmaps WHERE icon_id = ?"));
   statement.BindInt64(0, id);
   return statement.Run();
 }
 
-bool ThumbnailDatabase::GetIconMappingForPageURL(const GURL& page_url,
-                                                 IconType required_icon_type,
-                                                 IconMapping* icon_mapping) {
-  std::vector<IconMapping> icon_mappings;
-  if (!GetIconMappingsForPageURL(page_url, &icon_mappings))
+bool ThumbnailDatabase::GetIconMappingsForPageURL(
+    const GURL& page_url,
+    int required_icon_types,
+    std::vector<IconMapping>* filtered_mapping_data) {
+  std::vector<IconMapping> mapping_data;
+  if (!GetIconMappingsForPageURL(page_url, &mapping_data))
     return false;
 
-  for (std::vector<IconMapping>::iterator m = icon_mappings.begin();
-      m != icon_mappings.end(); ++m) {
-    if (m->icon_type == required_icon_type) {
-      if (icon_mapping != NULL)
-        *icon_mapping = *m;
-      return true;
+  bool result = false;

[sky, 2012/08/21 20:16:56]

Same comment as in GetFaviconBitmapIDSizeListing: get rid of result and check
filtered_mapping_data->empty instead.

+  for (std::vector<IconMapping>::iterator m = mapping_data.begin();
+       m != mapping_data.end(); ++m) {
+    if (m->icon_type & required_icon_types) {
+      result = true;
+      if (filtered_mapping_data == NULL)
+        return result;
+      filtered_mapping_data->push_back(*m);
     }
   }
-
-  return false;
+  return result;
 }
 
 bool ThumbnailDatabase::GetIconMappingsForPageURL(
     const GURL& page_url,
     std::vector<IconMapping>* mapping_data) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
-      "SELECT icon_mapping.id, icon_mapping.icon_id, favicons.icon_type "
+      "SELECT icon_mapping.id, icon_mapping.icon_id, favicons.icon_type, "
+      "favicons.url "
       "FROM icon_mapping "
       "INNER JOIN favicons "
       "ON icon_mapping.icon_id = favicons.id "
       "WHERE icon_mapping.page_url=? "
       "ORDER BY favicons.icon_type DESC"));
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(page_url));
 
   bool result = false;
   while (statement.Step()) {
     result = true;
@@ skipping 23 matching lines @@
 }
 
 bool ThumbnailDatabase::DeleteIconMappings(const GURL& page_url) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM icon_mapping WHERE page_url = ?"));
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(page_url));
 
   return statement.Run();
 }
 
+bool ThumbnailDatabase::DeleteIconMapping(IconMappingID mapping_id) {
+  sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
+      "DELETE FROM icon_mapping WHERE id=?"));
+  statement.BindInt64(0, mapping_id);
+
+  return statement.Run();
+}
+
 bool ThumbnailDatabase::HasMappingFor(FaviconID id) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id FROM icon_mapping "
       "WHERE icon_id=?"));
   statement.BindInt64(0, id);
 
   return statement.Step();
 }
 
-bool ThumbnailDatabase::CloneIconMapping(const GURL& old_page_url,
-                                         const GURL& new_page_url) {
+bool ThumbnailDatabase::CloneIconMappings(const GURL& old_page_url,
+                                          const GURL& new_page_url) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT icon_id FROM icon_mapping "
       "WHERE page_url=?"));
   if (!statement.is_valid())
     return false;
 
   // Do nothing if there are existing bindings
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(new_page_url));
   if (statement.Step())
     return true;
 
   statement.Assign(db_.GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO icon_mapping (page_url, icon_id) "
         "SELECT ?, icon_id FROM icon_mapping "
         "WHERE page_url = ?"));
 
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(new_page_url));
   statement.BindString(1, URLDatabase::GURLToDatabaseURL(old_page_url));
   return statement.Run();
 }
 
 bool ThumbnailDatabase::InitIconMappingEnumerator(
     IconType type,
     IconMappingEnumerator* enumerator) {
   DCHECK(!enumerator->statement_.is_valid());
   enumerator->statement_.Assign(db_.GetCachedStatement(
       SQL_FROM_HERE,
       "SELECT icon_mapping.id, icon_mapping.icon_id, favicons.icon_type, "
-             "icon_mapping.page_url "
+             "favicons.url, icon_mapping.page_url "
          "FROM icon_mapping JOIN favicons ON ("
               "icon_mapping.icon_id = favicons.id) "
          "WHERE favicons.icon_type = ?"));
   enumerator->statement_.BindInt(0, type);
   return enumerator->statement_.is_valid();
 }
 
 bool ThumbnailDatabase::MigrateIconMappingData(URLDatabase* url_db) {
   URLDatabase::IconMappingEnumerator e;
   if (!url_db->InitIconMappingEnumeratorForEverything(&e))
@@ skipping 254 matching lines @@
       db_.Execute("ALTER TABLE temp_favicons RENAME TO favicons");
   if (!success)
     return false;
 
   meta_table_.SetVersionNumber(6);
   meta_table_.SetCompatibleVersionNumber(std::min(6, kCompatibleVersionNumber));
   return true;
 }
 
 }  // namespace history