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

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

Issue 10996037: Do not convert from RectF to Rect by flooring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
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"
11 #include "ui/gfx/rect.h"
12 #include "ui/gfx/rect_base.h" 11 #include "ui/gfx/rect_base.h"
13 #include "ui/gfx/size_f.h" 12 #include "ui/gfx/size_f.h"
14 13
15 namespace gfx { 14 namespace gfx {
16 15
17 class InsetsF; 16 class InsetsF;
18 17
19 // A floating version of gfx::Rect. 18 // A floating version of gfx::Rect.
20 class UI_EXPORT RectF : public RectBase<RectF, PointF, SizeF, InsetsF, float> { 19 class UI_EXPORT RectF : public RectBase<RectF, PointF, SizeF, InsetsF, float> {
21 public: 20 public:
22 RectF(); 21 RectF();
23 RectF(float width, float height); 22 RectF(float width, float height);
24 RectF(float x, float y, float width, float height); 23 RectF(float x, float y, float width, float height);
25 explicit RectF(const gfx::SizeF& size); 24 explicit RectF(const gfx::SizeF& size);
26 RectF(const gfx::PointF& origin, const gfx::SizeF& size); 25 RectF(const gfx::PointF& origin, const gfx::SizeF& size);
27 26
28 ~RectF(); 27 ~RectF();
29 28
30 Rect ToRect() const; 29 /// Scales the rectangle by |scale|.
30 RectF Scale(float scale) const WARN_UNUSED_RESULT {
31 return Scale(scale, scale);
32 }
33
34 RectF Scale(float x_scale, float y_scale) const WARN_UNUSED_RESULT {
35 SizeF newSize = size().Scale(x_scale, y_scale);
36 newSize.ClampToNonNegative();
37 return RectF(origin().Scale(x_scale, y_scale), newSize);
38 }
31 39
32 std::string ToString() const; 40 std::string ToString() const;
33 }; 41 };
34 42
35 #if !defined(COMPILER_MSVC) 43 #if !defined(COMPILER_MSVC)
36 extern template class RectBase<RectF, PointF, SizeF, InsetsF, float>; 44 extern template class RectBase<RectF, PointF, SizeF, InsetsF, float>;
37 #endif 45 #endif
38 46
39 } // namespace gfx 47 } // namespace gfx
40 48
41 #endif // UI_GFX_RECT_H_ 49 #endif // UI_GFX_RECT_F_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698