diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 05:24:19 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 05:24:19 +0000 |
| commit | 685836bbb4799a9333821b431a7535b29391bd2e (patch) | |
| tree | e594b61457e5a487267c6be0a039353f849548f3 /ui/gfx/size_unittest.cc | |
| parent | fc290d614c7fab02dcdaf88b992a0204be23aa90 (diff) | |
| download | chromium_src-685836bbb4799a9333821b431a7535b29391bd2e.zip chromium_src-685836bbb4799a9333821b431a7535b29391bd2e.tar.gz chromium_src-685836bbb4799a9333821b431a7535b29391bd2e.tar.bz2 | |
ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always.
This was added with the intention of using Size as a vector, replacing use of
IntSize. Since we have Vector2d now, negative sizes should not exist, so clamp
them in set_width/set_height and the constructor.
R=sky
BUG=160158
Review URL: https://codereview.chromium.org/11365160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/size_unittest.cc')
| -rw-r--r-- | ui/gfx/size_unittest.cc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/ui/gfx/size_unittest.cc b/ui/gfx/size_unittest.cc index a6fda9d..e68bdd6 100644 --- a/ui/gfx/size_unittest.cc +++ b/ui/gfx/size_unittest.cc @@ -43,12 +43,6 @@ TEST(SizeTest, ToFlooredSize) { EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.4999f, 10.4999f))); EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.5f, 10.5f))); EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.9999f, 10.9999f))); - - EXPECT_EQ(Size(-10, -10), ToFlooredSize(SizeF(-10, -10))); - EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.0001f, -10.0001f))); - EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.4999f, -10.4999f))); - EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.5f, -10.5f))); - EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.9999f, -10.9999f))); } TEST(SizeTest, ToCeiledSize) { @@ -63,12 +57,6 @@ TEST(SizeTest, ToCeiledSize) { EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.4999f, 10.4999f))); EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.5f, 10.5f))); EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.9999f, 10.9999f))); - - EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10, -10))); - EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.0001f, -10.0001f))); - EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.4999f, -10.4999f))); - EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.5f, -10.5f))); - EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.9999f, -10.9999f))); } TEST(SizeTest, ToRoundedSize) { @@ -83,12 +71,6 @@ TEST(SizeTest, ToRoundedSize) { EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.4999f, 10.4999f))); EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f))); EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f))); - - EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10, -10))); - EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.0001f, -10.0001f))); - EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.4999f, -10.4999f))); - EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.5f, -10.5f))); - EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.9999f, -10.9999f))); } TEST(SizeTest, ClampSize) { |