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

Side by Side Diff: ui/gfx/rect_f.h

Issue 11359194: Revert 167255 - ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/base/gestures/gesture_sequence.cc ('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 #ifndef UI_GFX_RECT_F_H_ 5 #ifndef UI_GFX_RECT_F_H_
6 #define UI_GFX_RECT_F_H_ 6 #define UI_GFX_RECT_F_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/gfx/point_f.h" 10 #include "ui/gfx/point_f.h"
(...skipping 17 matching lines...) Expand all
28 28
29 ~RectF(); 29 ~RectF();
30 30
31 // Scales the rectangle by |scale|. 31 // Scales the rectangle by |scale|.
32 void Scale(float scale) { 32 void Scale(float scale) {
33 Scale(scale, scale); 33 Scale(scale, scale);
34 } 34 }
35 35
36 void Scale(float x_scale, float y_scale) { 36 void Scale(float x_scale, float y_scale) {
37 set_origin(ScalePoint(origin(), x_scale, y_scale)); 37 set_origin(ScalePoint(origin(), x_scale, y_scale));
38 set_size(ScaleSize(size(), x_scale, y_scale)); 38
39 SizeF new_size = gfx::ScaleSize(size(), x_scale, y_scale);
40 new_size.ClampToNonNegative();
41 set_size(new_size);
39 } 42 }
40 43
41 // This method reports if the RectF can be safely converted to an integer 44 // This method reports if the RectF can be safely converted to an integer
42 // Rect. When it is false, some dimension of the RectF is outside the bounds 45 // Rect. When it is false, some dimension of the RectF is outside the bounds
43 // of what an integer can represent, and converting it to a Rect will require 46 // of what an integer can represent, and converting it to a Rect will require
44 // clamping. 47 // clamping.
45 bool IsExpressibleAsRect() const; 48 bool IsExpressibleAsRect() const;
46 49
47 std::string ToString() const; 50 std::string ToString() const;
48 }; 51 };
(...skipping 30 matching lines...) Expand all
79 // contained within the rect, because they will appear on one of these edges. 82 // contained within the rect, because they will appear on one of these edges.
80 UI_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2); 83 UI_EXPORT RectF BoundingRect(const PointF& p1, const PointF& p2);
81 84
82 #if !defined(COMPILER_MSVC) 85 #if !defined(COMPILER_MSVC)
83 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>; 86 extern template class RectBase<RectF, PointF, SizeF, InsetsF, Vector2dF, float>;
84 #endif 87 #endif
85 88
86 } // namespace gfx 89 } // namespace gfx
87 90
88 #endif // UI_GFX_RECT_F_H_ 91 #endif // UI_GFX_RECT_F_H_
OLDNEW
« no previous file with comments | « ui/base/gestures/gesture_sequence.cc ('k') | ui/gfx/rect_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698