diff options
| author | pkasting <pkasting@chromium.org> | 2014-10-17 11:29:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-17 18:30:01 +0000 |
| commit | e232eca6b56b30a0e483cac8e4303d2e547db213 (patch) | |
| tree | 899cfd90a1cd2fce278da99155dad286435df2f6 /components/favicon_base/select_favicon_frames.cc | |
| parent | 69ccb323be58ff1d3cc9cb802b5e656832c8ccdb (diff) | |
| download | chromium_src-e232eca6b56b30a0e483cac8e4303d2e547db213.zip chromium_src-e232eca6b56b30a0e483cac8e4303d2e547db213.tar.gz chromium_src-e232eca6b56b30a0e483cac8e4303d2e547db213.tar.bz2 | |
Type conversion fixes, components/ edition.
This is mostly to fix MSVC warnings about possible value truncation.
BUG=81439
TEST=none
Review URL: https://codereview.chromium.org/656363002
Cr-Commit-Position: refs/heads/master@{#300134}
Diffstat (limited to 'components/favicon_base/select_favicon_frames.cc')
| -rw-r--r-- | components/favicon_base/select_favicon_frames.cc | 8 |
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)))); } } |