| Index: ui/gfx/image/image_skia_operations.cc
|
| diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc
|
| index 9657de9a3cb009d43f2e5cca6f9441b8614fd852..a9809b38f3a7dc4847992895b1666f352e00224a 100644
|
| --- a/ui/gfx/image/image_skia_operations.cc
|
| +++ b/ui/gfx/image/image_skia_operations.cc
|
| @@ -131,15 +131,14 @@ class TransparentImageSource : public gfx::ImageSkiaSource {
|
| virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
|
| ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
|
| SkBitmap alpha;
|
| - const float scale = ui::GetScaleFactorScale(image_rep.scale_factor());
|
| alpha.setConfig(SkBitmap::kARGB_8888_Config,
|
| - static_cast<int>(image_.size().width() * scale),
|
| - static_cast<int>(image_.size().height() * scale));
|
| + image_rep.pixel_width(),
|
| + image_rep.pixel_height());
|
| alpha.allocPixels();
|
| alpha.eraseColor(SkColorSetARGB(alpha_ * 255, 0, 0, 0));
|
| - return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap(
|
| - image_rep.sk_bitmap(), alpha),
|
| - image_rep.scale_factor());
|
| + return ImageSkiaRep(
|
| + SkBitmapOperations::CreateMaskedBitmap(image_rep.sk_bitmap(), alpha),
|
| + image_rep.scale_factor());
|
| }
|
|
|
| ImageSkia image_;
|
|
|