| Index: cc/tiles/mipmap_util.cc
|
| diff --git a/cc/tiles/mipmap_util.cc b/cc/tiles/mipmap_util.cc
|
| index ad35d8b0cfbd6abf8060a2c34eb7a8aaf2e804d7..d0ffbc9bf8610708622d6d88d2dfdd5fa957809e 100644
|
| --- a/cc/tiles/mipmap_util.cc
|
| +++ b/cc/tiles/mipmap_util.cc
|
| @@ -55,14 +55,22 @@ SkSize MipMapUtil::GetScaleAdjustmentForLevel(const gfx::Size& src_size,
|
| if (src_size.width() == 0 || src_size.height() == 0 || mip_level == -1)
|
| return SkSize::Make(-1, -1);
|
|
|
| - gfx::Size target_size(ScaleAxisToMipLevel(src_size.width(), mip_level),
|
| - ScaleAxisToMipLevel(src_size.height(), mip_level));
|
| + gfx::Size target_size = GetSizeForLevel(src_size, mip_level);
|
|
|
| return SkSize::Make(
|
| static_cast<float>(target_size.width()) / src_size.width(),
|
| static_cast<float>(target_size.height()) / src_size.height());
|
| }
|
|
|
| +gfx::Size MipMapUtil::GetSizeForLevel(const gfx::Size& src_size,
|
| + int mip_level) {
|
| + if (src_size.width() == 0 || src_size.height() == 0 || mip_level == -1)
|
| + return gfx::Size(-1, -1);
|
| +
|
| + return gfx::Size(ScaleAxisToMipLevel(src_size.width(), mip_level),
|
| + ScaleAxisToMipLevel(src_size.height(), mip_level));
|
| +}
|
| +
|
| SkSize MipMapUtil::GetScaleAdjustmentForSize(const gfx::Size& src_size,
|
| const gfx::Size& target_size) {
|
| int target_mip_level = GetLevelForSize(src_size, target_size);
|
|
|