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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/rect_conversions.h ('k') | ui/gfx/rect_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/rect_conversions.h" 5 #include "ui/gfx/rect_conversions.h"
6 6
7 #include <cmath>
8
9 #include "base/logging.h"
7 #include "ui/gfx/safe_integer_conversions.h" 10 #include "ui/gfx/safe_integer_conversions.h"
8 11
9 namespace gfx { 12 namespace gfx {
10 13
11 Rect ToEnclosingRect(const RectF& rect) { 14 Rect ToEnclosingRect(const RectF& rect) {
12 int min_x = ToFlooredInt(rect.origin().x()); 15 int min_x = ToFlooredInt(rect.origin().x());
13 int min_y = ToFlooredInt(rect.origin().y()); 16 int min_y = ToFlooredInt(rect.origin().y());
14 float max_x = rect.origin().x() + rect.size().width(); 17 float max_x = rect.origin().x() + rect.size().width();
15 float max_y = rect.origin().y() + rect.size().height(); 18 float max_y = rect.origin().y() + rect.size().height();
16 int width = std::max(ToCeiledInt(max_x) - min_x, 0); 19 int width = std::max(ToCeiledInt(max_x) - min_x, 0);
17 int height = std::max(ToCeiledInt(max_y) - min_y, 0); 20 int height = std::max(ToCeiledInt(max_y) - min_y, 0);
18 return Rect(min_x, min_y, width, height); 21 return Rect(min_x, min_y, width, height);
19 } 22 }
20 23
21 Rect ToEnclosedRect(const RectF& rect) { 24 Rect ToEnclosedRect(const RectF& rect) {
22 int min_x = ToCeiledInt(rect.origin().x()); 25 int min_x = ToCeiledInt(rect.origin().x());
23 int min_y = ToCeiledInt(rect.origin().y()); 26 int min_y = ToCeiledInt(rect.origin().y());
24 float max_x = rect.origin().x() + rect.size().width(); 27 float max_x = rect.origin().x() + rect.size().width();
25 float max_y = rect.origin().y() + rect.size().height(); 28 float max_y = rect.origin().y() + rect.size().height();
26 int width = std::max(ToFlooredInt(max_x) - min_x, 0); 29 int width = std::max(ToFlooredInt(max_x) - min_x, 0);
27 int height = std::max(ToFlooredInt(max_y) - min_y, 0); 30 int height = std::max(ToFlooredInt(max_y) - min_y, 0);
28 return Rect(min_x, min_y, width, height); 31 return Rect(min_x, min_y, width, height);
29 } 32 }
30 33
34 Rect ToNearestRect(const RectF& rect) {
35 float float_min_x = rect.origin().x();
36 float float_min_y = rect.origin().y();
37 float float_max_x = float_min_x + rect.size().width();
38 float float_max_y = float_min_y + rect.size().height();
39
40 int min_x = ToRoundedInt(float_min_x);
41 int min_y = ToRoundedInt(float_min_y);
42 int max_x = ToRoundedInt(float_max_x);
43 int max_y = ToRoundedInt(float_max_y);
44
45 // If these DCHECKs fail, you're using the wrong method, consider using
46 // ToEnclosingRect or ToEnclosedRect instead.
47 DCHECK(std::abs(min_x - float_min_x) < 0.01f);
48 DCHECK(std::abs(min_y - float_min_y) < 0.01f);
49 DCHECK(std::abs(max_x - float_max_x) < 0.01f);
50 DCHECK(std::abs(max_y - float_max_y) < 0.01f);
51
52 return Rect(min_x, min_y, max_x - min_x, max_y - min_y);
53 }
54
31 Rect ToFlooredRectDeprecated(const RectF& rect) { 55 Rect ToFlooredRectDeprecated(const RectF& rect) {
32 return Rect(ToFlooredInt(rect.origin().x()), 56 return Rect(ToFlooredInt(rect.origin().x()),
33 ToFlooredInt(rect.origin().y()), 57 ToFlooredInt(rect.origin().y()),
34 ToFlooredInt(rect.size().width()), 58 ToFlooredInt(rect.size().width()),
35 ToFlooredInt(rect.size().height())); 59 ToFlooredInt(rect.size().height()));
36 } 60 }
37 61
38 } // namespace gfx 62 } // namespace gfx
39 63
OLDNEW
« 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