| Index: ui/gfx/display.cc
|
| diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
|
| index 80e3149de7fc767587ab5c9c7aa481f5da43cebe..5d069a5347f09b76cf618761677875e5ed757a7b 100644
|
| --- a/ui/gfx/display.cc
|
| +++ b/ui/gfx/display.cc
|
| @@ -107,14 +107,8 @@ void Display::SetScaleAndBounds(
|
| float device_scale_factor,
|
| const gfx::Rect& bounds_in_pixel) {
|
| Insets insets = bounds_.InsetsFrom(work_area_);
|
| - if (!HasForceDeviceScaleFactor()) {
|
| -#if defined(OS_MACOSX)
|
| - // Unless an explicit scale factor was provided for testing, ensure the
|
| - // scale is integral.
|
| - device_scale_factor = static_cast<int>(device_scale_factor);
|
| -#endif
|
| + if (!HasForceDeviceScaleFactor())
|
| device_scale_factor_ = device_scale_factor;
|
| - }
|
| device_scale_factor_ = std::max(1.0f, device_scale_factor_);
|
| bounds_ = gfx::Rect(
|
| gfx::ToFlooredPoint(gfx::ScalePoint(bounds_in_pixel.origin(),
|
|
|