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

Unified Diff: ui/gfx/rect_conversions.cc

Issue 15233003: ui: ToEnclosingRect(empty rect) should return an empty rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « no previous file | 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 c548828aa2a9662b023e8421d1511f6e5fd3d937..ac7767b3204de84881b752a43c5c4a09d3e18744 100644
--- a/ui/gfx/rect_conversions.cc
+++ b/ui/gfx/rect_conversions.cc
@@ -16,8 +16,8 @@ Rect ToEnclosingRect(const RectF& rect) {
int min_y = ToFlooredInt(rect.y());
float max_x = rect.right();
float max_y = rect.bottom();
- int width = std::max(ToCeiledInt(max_x) - min_x, 0);
- int height = std::max(ToCeiledInt(max_y) - min_y, 0);
+ int width = rect.width() == 0 ? 0 : std::max(ToCeiledInt(max_x) - min_x, 0);
+ int height = rect.height() == 0 ? 0 : std::max(ToCeiledInt(max_y) - min_y, 0);
return Rect(min_x, min_y, width, height);
}
« no previous file with comments | « no previous file | ui/gfx/rect_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698