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

Unified Diff: ui/gfx/rect_conversions.cc

Issue 11359172: ui: Remove implicit flooring in skia rect conversion methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make root window transform in tests produce an integer result 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
« no previous file with comments | « ui/gfx/rect_conversions.h ('k') | ui/gfx/rect_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/rect_conversions.cc
diff --git a/ui/gfx/rect_conversions.cc b/ui/gfx/rect_conversions.cc
index 160c547a737c9d8ec5f1d8dd6f25dda6dcc2edd6..c0391b3d03953d1d1a5817752f73054d35eaff66 100644
--- a/ui/gfx/rect_conversions.cc
+++ b/ui/gfx/rect_conversions.cc
@@ -4,6 +4,9 @@
#include "ui/gfx/rect_conversions.h"
+#include <cmath>
+
+#include "base/logging.h"
#include "ui/gfx/safe_integer_conversions.h"
namespace gfx {
@@ -28,6 +31,27 @@ Rect ToEnclosedRect(const RectF& rect) {
return Rect(min_x, min_y, width, height);
}
+Rect ToNearestRect(const RectF& rect) {
+ float float_min_x = rect.origin().x();
+ float float_min_y = rect.origin().y();
+ float float_max_x = float_min_x + rect.size().width();
+ float float_max_y = float_min_y + rect.size().height();
+
+ int min_x = ToRoundedInt(float_min_x);
+ int min_y = ToRoundedInt(float_min_y);
+ int max_x = ToRoundedInt(float_max_x);
+ int max_y = ToRoundedInt(float_max_y);
+
+ // If these DCHECKs fail, you're using the wrong method, consider using
+ // ToEnclosingRect or ToEnclosedRect instead.
+ DCHECK(std::abs(min_x - float_min_x) < 0.01f);
+ DCHECK(std::abs(min_y - float_min_y) < 0.01f);
+ DCHECK(std::abs(max_x - float_max_x) < 0.01f);
+ DCHECK(std::abs(max_y - float_max_y) < 0.01f);
+
+ return Rect(min_x, min_y, max_x - min_x, max_y - min_y);
+}
+
Rect ToFlooredRectDeprecated(const RectF& rect) {
return Rect(ToFlooredInt(rect.origin().x()),
ToFlooredInt(rect.origin().y()),
« no previous file with comments | « ui/gfx/rect_conversions.h ('k') | ui/gfx/rect_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698