Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: ui/gfx/geometry/safe_integer_conversions_unittest.cc

Issue 1164063005: Replace gfx::ClampToInt with base::saturated_cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clamp: . Created 5 years, 6 months 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
« no previous file with comments | « ui/gfx/geometry/safe_integer_conversions.h ('k') | ui/gfx/transform_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/geometry/safe_integer_conversions_unittest.cc
diff --git a/ui/gfx/geometry/safe_integer_conversions_unittest.cc b/ui/gfx/geometry/safe_integer_conversions_unittest.cc
index 099dc4d7df568edfcf11a26621eaf83ba1c929b8..91bdbb8d3593020fc58df008040640b44cbb0d20 100644
--- a/ui/gfx/geometry/safe_integer_conversions_unittest.cc
+++ b/ui/gfx/geometry/safe_integer_conversions_unittest.cc
@@ -10,32 +10,7 @@
namespace gfx {
-TEST(SafeIntegerConversions, ClampToInt) {
- EXPECT_EQ(0, ClampToInt(std::numeric_limits<float>::quiet_NaN()));
-
- float max = std::numeric_limits<int>::max();
- float min = std::numeric_limits<int>::min();
- float infinity = std::numeric_limits<float>::infinity();
-
- int int_max = std::numeric_limits<int>::max();
- int int_min = std::numeric_limits<int>::min();
-
- EXPECT_EQ(int_max, ClampToInt(infinity));
- EXPECT_EQ(int_max, ClampToInt(max));
- EXPECT_EQ(int_max, ClampToInt(max + 100));
-
- EXPECT_EQ(-100, ClampToInt(-100.5f));
- EXPECT_EQ(0, ClampToInt(0));
- EXPECT_EQ(100, ClampToInt(100.5f));
-
- EXPECT_EQ(int_min, ClampToInt(-infinity));
- EXPECT_EQ(int_min, ClampToInt(min));
- EXPECT_EQ(int_min, ClampToInt(min - 100));
-}
-
TEST(SafeIntegerConversions, ToFlooredInt) {
- EXPECT_EQ(0, ToFlooredInt(std::numeric_limits<float>::quiet_NaN()));
-
float max = std::numeric_limits<int>::max();
float min = std::numeric_limits<int>::min();
float infinity = std::numeric_limits<float>::infinity();
@@ -57,8 +32,6 @@ TEST(SafeIntegerConversions, ToFlooredInt) {
}
TEST(SafeIntegerConversions, ToCeiledInt) {
- EXPECT_EQ(0, ToCeiledInt(std::numeric_limits<float>::quiet_NaN()));
-
float max = std::numeric_limits<int>::max();
float min = std::numeric_limits<int>::min();
float infinity = std::numeric_limits<float>::infinity();
@@ -80,8 +53,6 @@ TEST(SafeIntegerConversions, ToCeiledInt) {
}
TEST(SafeIntegerConversions, ToRoundedInt) {
- EXPECT_EQ(0, ToRoundedInt(std::numeric_limits<float>::quiet_NaN()));
-
float max = std::numeric_limits<int>::max();
float min = std::numeric_limits<int>::min();
float infinity = std::numeric_limits<float>::infinity();
« no previous file with comments | « ui/gfx/geometry/safe_integer_conversions.h ('k') | ui/gfx/transform_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698