wip

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 <utility>
@@ skipping 1925 matching lines @@
   // downloading the favicon and invoking SetFavicon.
   request->ForwardResult(request->handle(), favicon);
 }
 
 FaviconID HistoryBackend::GetFaviconID(
     const std::vector<FaviconIDSize>& favicon_id_size_listing,
     const gfx::Size& desired_pixel_size) const {
   // Find favicon size which most closely matches |desired_pixel_size|.
   // Give preference to favicon sizes which will result in downscaling rather
   // than upscaling.
+  // XXX needs to be closer to what cole wants. ideally, we'd just load
+  // all variants?
   FaviconID closest_favicon_id = 0;
   gfx::Size closest_pixel_size;
   for (size_t i = 0; i < favicon_id_size_listing.size(); ++i) {
     gfx::Size size = favicon_id_size_listing[i].icon_size;
     if (closest_pixel_size.GetArea() < desired_pixel_size.GetArea() &&
         size.GetArea() > closest_pixel_size.GetArea()) {
       closest_favicon_id = favicon_id_size_listing[i].icon_id;
       closest_pixel_size = size;
     } else if (closest_pixel_size.GetArea() > desired_pixel_size.GetArea() &&
                size.GetArea() < closest_pixel_size.GetArea() &&
@@ skipping 589 matching lines @@
                       TimeTicks::Now() - beginning_time);
   return !icon_mappings.empty();
 }
 
 bool HistoryBackend::GetFaviconFromDB(FaviconID favicon_id,
                                       FaviconData* favicon) {
   Time last_updated;
   scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
 
   favicon->known_icon = true;
+  favicon->variants.resize(1);  // XXX
   if (!thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data->data(),
-      &favicon->icon_url, &favicon->pixel_size, &favicon->icon_type))
+      &favicon->icon_url, &favicon->variants[0].pixel_size,
+      &favicon->icon_type))
     return false;
 
   favicon->expired = (Time::Now() - last_updated) >
       TimeDelta::FromDays(kFaviconRefetchDays);
-  favicon->bitmap_data = data;
+  favicon->variants[0].bitmap_data = data;
   return true;
 }
 
 void HistoryBackend::NotifyVisitObservers(const VisitRow& visit) {
   BriefVisitInfo info;
   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