diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 03:51:36 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 03:51:36 +0000 |
| commit | 62c607121a2c0b5bf463cd6da0fd568140523e30 (patch) | |
| tree | e99d2d69b958590be8a1afa65065d76d97a3a025 /ui/gfx/size.cc | |
| parent | 55b4f27b45cf6a09f0f29222efef8f561a0733c7 (diff) | |
| download | chromium_src-62c607121a2c0b5bf463cd6da0fd568140523e30.zip chromium_src-62c607121a2c0b5bf463cd6da0fd568140523e30.tar.gz chromium_src-62c607121a2c0b5bf463cd6da0fd568140523e30.tar.bz2 | |
ui: Prevent negative sizes.
Negative sizes are clamped to be 0, but keeping the setter methods inline, so without DCHECKs.
TBR=sky
BUG=160158
Relanding https://codereview.chromium.org/11365160/ in pieces.
Review URL: https://chromiumcodereview.appspot.com/12042029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/size.cc')
| -rw-r--r-- | ui/gfx/size.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/gfx/size.cc b/ui/gfx/size.cc index a9a0bdd..b91f70e 100644 --- a/ui/gfx/size.cc +++ b/ui/gfx/size.cc @@ -8,18 +8,15 @@ #include <windows.h> #endif -#include "base/logging.h" #include "base/stringprintf.h" -#include "ui/gfx/size_base.h" namespace gfx { template class SizeBase<Size, int>; #if defined(OS_MACOSX) -Size::Size(const CGSize& s) : SizeBase<Size, int>(0, 0) { - set_width(s.width); - set_height(s.height); +Size::Size(const CGSize& s) + : SizeBase<Size, int>(s.width, s.height) { } Size& Size::operator=(const CGSize& s) { |