Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/favicon/favicon_service.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc ('k') | trunk/src/chrome/browser/favicon/favicon_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/favicon/favicon_service.cc
===================================================================
--- trunk/src/chrome/browser/favicon/favicon_service.cc (revision 224497)
+++ trunk/src/chrome/browser/favicon/favicon_service.cc (working copy)
@@ -238,7 +238,7 @@
return;
gfx::ImageSkia image_skia = image.AsImageSkia();
- image_skia.EnsureRepsForSupportedScales();
+ image_skia.EnsureRepsForSupportedScaleFactors();
const std::vector<gfx::ImageSkiaRep>& image_reps = image_skia.image_reps();
std::vector<chrome::FaviconBitmapData> favicon_bitmap_data;
for (size_t i = 0; i < image_reps.size(); ++i) {
@@ -343,7 +343,7 @@
}
// If history bitmap is already desired pixel size, return early.
- float desired_scale = ui::GetImageScale(desired_scale_factor);
+ float desired_scale = ui::GetScaleFactorScale(desired_scale_factor);
int desired_edge_width_in_pixel = static_cast<int>(
desired_size_in_dip * desired_scale + 0.5f);
gfx::Size desired_size_in_pixel(desired_edge_width_in_pixel,
« no previous file with comments | « trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc ('k') | trunk/src/chrome/browser/favicon/favicon_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698