| Index: ui/gfx/canvas.cc
|
| diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
|
| index c4f98d68b515ba3cdbaae7ffe42631966f044584..78badf1694873acfc852b5d1b42b633e6a1371be 100644
|
| --- a/ui/gfx/canvas.cc
|
| +++ b/ui/gfx/canvas.cc
|
| @@ -13,6 +13,7 @@
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/font.h"
|
| #include "ui/gfx/rect.h"
|
| +#include "ui/gfx/size_conversions.h"
|
| #include "ui/gfx/skia_util.h"
|
| #include "ui/gfx/transform.h"
|
|
|
| @@ -28,7 +29,8 @@ Canvas::Canvas(const gfx::Size& size,
|
| : scale_factor_(scale_factor),
|
| owned_canvas_(NULL),
|
| canvas_(NULL) {
|
| - gfx::Size pixel_size = size.Scale(ui::GetScaleFactorScale(scale_factor));
|
| + gfx::Size pixel_size = gfx::ToFlooredSize(size.Scale(
|
| + ui::GetScaleFactorScale(scale_factor)));
|
| owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(),
|
| pixel_size.height(),
|
| is_opaque));
|
| @@ -74,7 +76,8 @@ void Canvas::RecreateBackingCanvas(const gfx::Size& size,
|
| ui::ScaleFactor scale_factor,
|
| bool is_opaque) {
|
| scale_factor_ = scale_factor;
|
| - gfx::Size pixel_size = size.Scale(ui::GetScaleFactorScale(scale_factor));
|
| + gfx::Size pixel_size = gfx::ToFlooredSize(
|
| + size.Scale(ui::GetScaleFactorScale(scale_factor)));
|
| owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(),
|
| pixel_size.height(),
|
| is_opaque));
|
|
|