ui/gfx/size_unittest.cc - Issue 11365160: ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/size_unittest.cc

Issue 11365160: ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit tests that use negative values or NaN Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/gfx/size_unittest.cc

diff --git a/ui/gfx/size_unittest.cc b/ui/gfx/size_unittest.cc

index a6fda9d980cbbbb47eae5f9ae433110f9bec559c..e68bdd61d38b10f9321786df8aa18d4d69f446d9 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) {

« no previous file with comments | « ui/gfx/size_f.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »