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

Unified Diff: chrome/browser/favicon/select_favicon_frames.cc

Issue 10837278: fix win build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/select_favicon_frames.cc
diff --git a/chrome/browser/favicon/select_favicon_frames.cc b/chrome/browser/favicon/select_favicon_frames.cc
index d77b1d9207281e14a88072317bbdd5e4ad8551f2..605ba690e2c15a343ba86fc2752b7c231268b885 100644
--- a/chrome/browser/favicon/select_favicon_frames.cc
+++ b/chrome/browser/favicon/select_favicon_frames.cc
@@ -82,7 +82,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps,
for (size_t i = 0; i < bitmaps.size(); ++i) {
if (bitmaps[i].width() == source_size &&
bitmaps[i].height() == source_size) {
- *score = 0.2;
+ *score = 0.2f;
return PadWithBorder(bitmaps[i], desired_size, source_size);
}
}
@@ -90,7 +90,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps,
for (size_t i = 0; i < bitmaps.size(); ++i) {
if (bitmaps[i].width() * scale == source_size &&
bitmaps[i].height() * scale == source_size) {
- *score = 0.15;
+ *score = 0.15f;
return PadWithBorder(bitmaps[i], desired_size, source_size);
}
}
@@ -110,7 +110,7 @@ SkBitmap SelectCandidate(const std::vector<SkBitmap>& bitmaps,
min_area = area;
}
}
- *score = 0.1;
+ *score = 0.1f;
// c) Else, from the biggest smaller variant.
if (candidate == -1) {
*score = 0;
@@ -144,7 +144,7 @@ gfx::ImageSkia SelectFaviconFrames(
multi_image.AddRepresentation(
gfx::ImageSkiaRep(bitmaps[max_index], ui::SCALE_FACTOR_100P));
if (match_score)
- *match_score = 0.8;
+ *match_score = 0.8f;
return multi_image;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698