Cleanup thumbnail database part #2

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 557 matching lines @@
     *icon_url = GURL(statement.ColumnString(0));
   if (icon_type)
     *icon_type = static_cast<history::IconType>(statement.ColumnInt(1));
   if (favicon_sizes)
     DatabaseStringToFaviconSizes(statement.ColumnString(2), favicon_sizes);
 
   return true;
 }
 
 FaviconID ThumbnailDatabase::AddFavicon(const GURL& icon_url,
-                                        IconType icon_type) {
+                                        IconType icon_type,
+                                        const FaviconSizes& favicon_sizes) {
+  std::string favicon_sizes_as_string;
+  FaviconSizesToDatabaseString(favicon_sizes, &favicon_sizes_as_string);
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
-      "INSERT INTO favicons (url, icon_type) VALUES (?, ?)"));
+      "INSERT INTO favicons (url, icon_type, sizes) VALUES (?, ?, ?)"));
   statement.BindString(0, URLDatabase::GURLToDatabaseURL(icon_url));
   statement.BindInt(1, icon_type);
+  statement.BindString(2, favicon_sizes_as_string);
 
   if (!statement.Run())
     return 0;
   return db_.GetLastInsertRowId();
 }
 
 FaviconID ThumbnailDatabase::AddFavicon(
     const GURL& icon_url,
     IconType icon_type,
     const FaviconSizes& favicon_sizes,
     const scoped_refptr<base::RefCountedMemory>& icon_data,
     base::Time time,
     const gfx::Size& pixel_size) {
-  FaviconID icon_id = AddFavicon(icon_url, icon_type);
-  if (!icon_id ||
-      !SetFaviconSizes(icon_id, favicon_sizes) ||
-      !AddFaviconBitmap(icon_id, icon_data, time, pixel_size)) {
+  FaviconID icon_id = AddFavicon(icon_url, icon_type, favicon_sizes);
+  if (!icon_id || !AddFaviconBitmap(icon_id, icon_data, time, pixel_size))
     return 0;
-  }
+
   return icon_id;
 }
 
 bool ThumbnailDatabase::DeleteFavicon(FaviconID id) {
   sql::Statement statement;
   statement.Assign(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM favicons WHERE id = ?"));
   statement.BindInt64(0, id);
   if (!statement.Run())
     return false;
@@ skipping 12 matching lines @@
   if (!GetIconMappingsForPageURL(page_url, &mapping_data))
     return false;
 
   bool result = false;
   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)
         return result;
+
+      // Restrict icon type of subsequent matches to |m->icon_type|.
+      // |m->icon_type| is the largest IconType in |mapping_data| because
+      // |mapping_data| is sorted in descending order of IconType.
+      required_icon_types = m->icon_type;
+
       filtered_mapping_data->push_back(*m);
     }
   }
   return result;
 }
 
 bool ThumbnailDatabase::GetIconMappingsForPageURL(
     const GURL& page_url,
     std::vector<IconMapping>* mapping_data) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
@@ skipping 391 matching lines @@
     }
     parsing_errors |= !base::StringToInt(t.token(), &height);
     favicon_sizes->push_back(gfx::Size(width, height));
   }
 
   if (parsing_errors)
     favicon_sizes->clear();
 }
 
 }  // namespace history