| Index: ui/gfx/image/image_skia_rep.cc
|
| diff --git a/ui/gfx/image/image_skia_rep.cc b/ui/gfx/image/image_skia_rep.cc
|
| index fe3823058b48cd26d01f8fcd2472151af21e4879..be0331a3038780da00a2d7f3a21146c71c6bf8c1 100644
|
| --- a/ui/gfx/image/image_skia_rep.cc
|
| +++ b/ui/gfx/image/image_skia_rep.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/gfx/image/image_skia_rep.h"
|
|
|
| +#include "ui/gfx/size.h"
|
| +
|
| namespace gfx {
|
|
|
| ImageSkiaRep::ImageSkiaRep()
|
| @@ -13,13 +15,13 @@ ImageSkiaRep::ImageSkiaRep()
|
| ImageSkiaRep::~ImageSkiaRep() {
|
| }
|
|
|
| -ImageSkiaRep::ImageSkiaRep(int width, int height,
|
| +ImageSkiaRep::ImageSkiaRep(const gfx::Size& size,
|
| ui::ScaleFactor scale_factor)
|
| : scale_factor_(scale_factor) {
|
| float scale = ui::GetScaleFactorScale(scale_factor);
|
| bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
|
| - static_cast<int>(width * scale),
|
| - static_cast<int>(height * scale));
|
| + static_cast<int>(size.width() * scale),
|
| + static_cast<int>(size.height() * scale));
|
| bitmap_.allocPixels();
|
| }
|
|
|
|
|