Chromium Code Reviews| Index: ui/gfx/win/dpi.cc |
| diff --git a/ui/gfx/win/dpi.cc b/ui/gfx/win/dpi.cc |
| index e93a38d8bd00cee34c1fae4fc8007d56709d6d57..bb8ff63a85ba126e3a82c0a662f686cdb56fa7fe 100644 |
| --- a/ui/gfx/win/dpi.cc |
| +++ b/ui/gfx/win/dpi.cc |
| @@ -134,14 +134,15 @@ Size GetDPI() { |
| float GetDPIScale() { |
| if (IsHighDPIEnabled()) { |
| - if (GetDPI().width() <= 120) { |
| - // 120 logical pixels is 125% scale. We do this to maintain previous |
| + float dpi_scale = gfx::Display::HasForceDeviceScaleFactor() ? |
|
sky
2014/09/24 23:51:15
If there is a forced scale we should honor it.
ananta
2014/09/24 23:56:00
Thanks for catching that. Fixed
|
| + gfx::Display::GetForcedDeviceScaleFactor() : |
| + GetUnforcedDeviceScaleFactor(); |
| + if (dpi_scale <= 1.25) { |
| + // Force 125% and below to 100% scale. We do this to maintain previous |
| // (non-DPI-aware) behavior where only the font size was boosted. |
| return 1.0; |
| } |
| - return gfx::Display::HasForceDeviceScaleFactor() ? |
| - gfx::Display::GetForcedDeviceScaleFactor() : |
| - GetUnforcedDeviceScaleFactor(); |
| + return dpi_scale; |
| } |
| return 1.0; |
| } |