diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 23:17:35 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 23:17:35 +0000 |
| commit | 4b01b9680e67ba802e8a16027ffe4b4d435fc1e8 (patch) | |
| tree | 675aa1ca07fa8f0d3bb1f0f4249822a6bf4e817d /ui/gfx/display.cc | |
| parent | 0c77646718f41510a03905f1ed31cd382109a6c4 (diff) | |
| download | chromium_src-4b01b9680e67ba802e8a16027ffe4b4d435fc1e8.zip chromium_src-4b01b9680e67ba802e8a16027ffe4b4d435fc1e8.tar.gz chromium_src-4b01b9680e67ba802e8a16027ffe4b4d435fc1e8.tar.bz2 | |
Remove implicit flooring Scale() method from Point and Size.
When scaling an integer point or size, return a floating point
result. Implicitly flooring hides design problems and bugs. Add
conversion functions to floor or ceil a SizeF or PointF
into an integer format again.
All existing behaviour has been preserved by replacing uses of
foo.Scale() with ToFlooredFoo(foo.Scale()).
R=sky
BUG=147395
Review URL: https://chromiumcodereview.appspot.com/11081007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/display.cc')
| -rw-r--r-- | ui/gfx/display.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc index 9fcf156..e647f65 100644 --- a/ui/gfx/display.cc +++ b/ui/gfx/display.cc @@ -10,6 +10,7 @@ #include "base/stringprintf.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/insets.h" +#include "ui/gfx/size_conversions.h" namespace gfx { namespace { @@ -87,8 +88,8 @@ void Display::SetScaleAndBounds( #if defined(USE_AURA) bounds_in_pixel_ = bounds_in_pixel; #endif - bounds_ = gfx::Rect( - bounds_in_pixel.size().Scale(1.0f / device_scale_factor_)); + bounds_ = gfx::Rect(gfx::ToFlooredSize( + bounds_in_pixel.size().Scale(1.0f / device_scale_factor_))); UpdateWorkAreaFromInsets(insets); } @@ -108,7 +109,7 @@ void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) { } gfx::Size Display::GetSizeInPixel() const { - return size().Scale(device_scale_factor_); + return gfx::ToFlooredSize(size().Scale(device_scale_factor_)); } std::string Display::ToString() const { |