Convert ui::ScaleFactor -> float in favicon/history code

chrome/browser/favicon/favicon_handler.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/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 105 matching lines @@
   // |bitmap_results| should always be complete for data inserted by
   // FaviconHandler as the FaviconHandler stores favicons resized to all
   // of favicon_base::GetFaviconScaleFactors() into the history backend.
   // Examples of when |bitmap_results| can be incomplete:
   // - Favicons inserted into the history backend by sync.
   // - Favicons for imported bookmarks.
   std::vector<gfx::Size> favicon_sizes;
   for (size_t i = 0; i < bitmap_results.size(); ++i)
     favicon_sizes.push_back(bitmap_results[i].pixel_size);
 
-  std::vector<ui::ScaleFactor> scale_factors =
-      favicon_base::GetFaviconScaleFactors();
-  for (size_t i = 0; i < scale_factors.size(); ++i) {
-    int edge_size_in_pixel = floor(
-        desired_size_in_dip * ui::GetScaleForScaleFactor(scale_factors[i]));
+  std::vector<float> favicon_scales = favicon_base::GetFaviconScales();
+  for (size_t i = 0; i < favicon_scales.size(); ++i) {
+    int edge_size_in_pixel = floor(desired_size_in_dip * favicon_scales[i]);

[pkotwicz, 2014/06/18 15:46:33]

This should be ceil()

     std::vector<gfx::Size>::iterator it = std::find(favicon_sizes.begin(),
         favicon_sizes.end(), gfx::Size(edge_size_in_pixel, edge_size_in_pixel));
     if (it == favicon_sizes.end())
       return true;
   }
   return false;
 }
 
 // Returns true if at least one of |bitmap_results| is valid.
 bool HasValidResult(
@@ skipping 169 matching lines @@
   if (UrlMatches(url, url_) && icon_type == favicon_base::FAVICON) {
     if (!PageChangedSinceFaviconWasRequested())
       SetFaviconOnActivePage(icon_url, image);
   }
 }
 
 void FaviconHandler::SetFaviconOnActivePage(const std::vector<
     favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results) {
   gfx::Image resized_image = favicon_base::SelectFaviconFramesFromPNGs(
       favicon_bitmap_results,
-      favicon_base::GetFaviconScaleFactors(),
+      favicon_base::GetFaviconScales(),
       preferred_icon_size());
   // The history service sends back results for a single icon URL, so it does
   // not matter which result we get the |icon_url| from.
   const GURL icon_url = favicon_bitmap_results.empty() ?
       GURL() : favicon_bitmap_results[0].icon_url;
   SetFaviconOnActivePage(icon_url, resized_image);
 }
 
 void FaviconHandler::SetFaviconOnActivePage(const GURL& icon_url,
                                             const gfx::Image& image) {
@@ skipping 90 matching lines @@
                                current_candidate()->icon_sizes[0]);
         // Find largest bitmap if there is no one exactly matched.
         if (index == -1) {
           index = GetLargestSizeIndex(original_bitmap_sizes,
                                       max_size * max_size);
         }
       }
       if (index != -1)
         image_skia = gfx::ImageSkia(gfx::ImageSkiaRep(bitmaps[index], 1));
     } else {
-      std::vector<ui::ScaleFactor> scale_factors =
-          favicon_base::GetFaviconScaleFactors();
       image_skia = SelectFaviconFrames(bitmaps,
                                        original_bitmap_sizes,
-                                       scale_factors,
+                                       favicon_base::GetFaviconScales(),
                                        preferred_icon_size(),
                                        &score);
     }
 
     if (!image_skia.isNull()) {
       gfx::Image image(image_skia);
       // The downloaded icon is still valid when there is no FaviconURL update
       // during the downloading.
       if (!bitmaps.empty()) {
         request_next_icon = !UpdateFaviconCandidate(
@@ skipping 238 matching lines @@
     } else {
       gfx::Size largest = i->icon_sizes[index];
       i->icon_sizes.clear();
       i->icon_sizes.push_back(largest);
       ++i;
     }
   }
   std::stable_sort(image_urls_.begin(), image_urls_.end(),
                    CompareIconSize);
 }