summaryrefslogtreecommitdiffstats
path: root/components/favicon_base/select_favicon_frames.cc
diff options
context:
space:
mode:
Diffstat (limited to 'components/favicon_base/select_favicon_frames.cc')
-rw-r--r--components/favicon_base/select_favicon_frames.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index 8df5f8c..d53225d 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -41,8 +41,9 @@ SkBitmap SampleNearestNeighbor(const SkBitmap& contents, int desired_size) {
{
SkCanvas canvas(bitmap);
- SkRect dest(SkRect::MakeWH(desired_size, desired_size));
- canvas.drawBitmapRect(contents, NULL, dest);
+ canvas.drawBitmapRect(
+ contents, NULL,
+ SkRect::MakeFromIRect(SkIRect::MakeWH(desired_size, desired_size)));
}
return bitmap;
@@ -224,7 +225,8 @@ gfx::ImageSkia CreateFaviconImageSkia(
} else {
for (std::vector<float>::const_iterator iter = favicon_scales.begin();
iter != favicon_scales.end(); ++iter) {
- desired_sizes.push_back(ceil(desired_size_in_dip * (*iter)));
+ desired_sizes.push_back(
+ static_cast<int>(ceil(desired_size_in_dip * (*iter))));
}
}