From 62c607121a2c0b5bf463cd6da0fd568140523e30 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Wed, 23 Jan 2013 03:51:36 +0000 Subject: 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 --- ui/gfx/size.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'ui/gfx/size.cc') 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 #endif -#include "base/logging.h" #include "base/stringprintf.h" -#include "ui/gfx/size_base.h" namespace gfx { template class SizeBase; #if defined(OS_MACOSX) -Size::Size(const CGSize& s) : SizeBase(0, 0) { - set_width(s.width); - set_height(s.height); +Size::Size(const CGSize& s) + : SizeBase(s.width, s.height) { } Size& Size::operator=(const CGSize& s) { -- cgit v1.1