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

Unified Diff: ui/gfx/geometry/safe_integer_conversions.h

Issue 649203003: Type conversion fixes, ui/gfx/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 6 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
« no previous file with comments | « ui/gfx/geometry/rect.h ('k') | ui/gfx/geometry/safe_integer_conversions_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.h
diff --git a/ui/gfx/geometry/safe_integer_conversions.h b/ui/gfx/geometry/safe_integer_conversions.h
index 58ed2a9336ea12a2d2e632d13b50851cdcad83b8..873378018b497f6c1b0ce5465e6931e7e0d412b8 100644
--- a/ui/gfx/geometry/safe_integer_conversions.h
+++ b/ui/gfx/geometry/safe_integer_conversions.h
@@ -47,6 +47,15 @@ inline int ToRoundedInt(float value) {
return ClampToInt(rounded);
}
+inline int ToRoundedInt(double value) {
+ double rounded;
+ if (value >= 0.0)
+ rounded = std::floor(value + 0.5);
+ else
+ rounded = std::ceil(value - 0.5);
+ return ClampToInt(rounded);
+}
+
inline bool IsExpressibleAsInt(float value) {
if (value != value)
return false; // no int NaN.
« no previous file with comments | « ui/gfx/geometry/rect.h ('k') | ui/gfx/geometry/safe_integer_conversions_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698