| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index 5a77c12a1d851629eeea188b737a9b538e3769c8..294b48a12db25990c3997700c179d9c1ec0d731f 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -29,6 +29,7 @@
|
| #include "ui/gfx/image/image_skia.h"
|
| #include "ui/gfx/image/image_skia_source.h"
|
| #include "ui/gfx/screen.h"
|
| +#include "ui/gfx/size_conversions.h"
|
| #include "ui/gfx/skbitmap_operations.h"
|
|
|
| namespace ui {
|
| @@ -73,7 +74,7 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
|
| ui::ScaleFactor scale_factor) OVERRIDE {
|
| scoped_ptr<SkBitmap> result(rb_->LoadBitmap(resource_id_, scale_factor));
|
| float scale = ui::GetScaleFactorScale(scale_factor);
|
| - gfx::Size size_in_pixel = size_in_dip_.Scale(scale);
|
| + gfx::Size size_in_pixel = gfx::ToFlooredSize(size_in_dip_.Scale(scale));
|
|
|
| if (scale_factor != SCALE_FACTOR_100P &&
|
| (!result.get() ||
|
|
|