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

Side by Side Diff: ui/gfx/geometry/size_f.h

Issue 662273002: gfx:: De-templatize Size and SizeF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: inlines-size: . Created 6 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
« no previous file with comments | « ui/gfx/geometry/size_base.h ('k') | ui/gfx/geometry/size_f.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_GEOMETRY_SIZE_F_H_ 5 #ifndef UI_GFX_GEOMETRY_SIZE_F_H_
6 #define UI_GFX_GEOMETRY_SIZE_F_H_ 6 #define UI_GFX_GEOMETRY_SIZE_F_H_
7 7
8 #include <cmath>
8 #include <iosfwd> 9 #include <iosfwd>
9 #include <string> 10 #include <string>
10 11
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "ui/gfx/geometry/size_base.h"
13 #include "ui/gfx/gfx_export.h" 13 #include "ui/gfx/gfx_export.h"
14 14
15 namespace gfx { 15 namespace gfx {
16 16
17 // A floating version of gfx::Size. 17 // A floating version of gfx::Size.
18 class GFX_EXPORT SizeF : public SizeBase<SizeF, float> { 18 class GFX_EXPORT SizeF {
19 public: 19 public:
20 SizeF() : SizeBase<SizeF, float>(0, 0) {} 20 SizeF() : width_(0.f), height_(0.f) {}
21 SizeF(float width, float height) : SizeBase<SizeF, float>(width, height) {} 21 SizeF(float width, float height)
22 : width_(fmaxf(0, width)), height_(fmaxf(0, height)) {}
22 ~SizeF() {} 23 ~SizeF() {}
23 24
25 float width() const { return width_; }
26 float height() const { return height_; }
27
28 void set_width(float width) { width_ = fmaxf(0, width); }
29 void set_height(float height) { height_ = fmaxf(0, height); }
30
31 float GetArea() const;
32
33 void SetSize(float width, float height) {
34 set_width(width);
35 set_height(height);
36 }
37
38 void Enlarge(float grow_width, float grow_height);
39
40 void SetToMin(const SizeF& other);
41 void SetToMax(const SizeF& other);
42
43 bool IsEmpty() const { return !width() || !height(); }
44
24 void Scale(float scale) { 45 void Scale(float scale) {
25 Scale(scale, scale); 46 Scale(scale, scale);
26 } 47 }
27 48
28 void Scale(float x_scale, float y_scale) { 49 void Scale(float x_scale, float y_scale) {
29 SetSize(width() * x_scale, height() * y_scale); 50 SetSize(width() * x_scale, height() * y_scale);
30 } 51 }
31 52
32 std::string ToString() const; 53 std::string ToString() const;
54
55 private:
56 float width_;
57 float height_;
33 }; 58 };
34 59
35 inline bool operator==(const SizeF& lhs, const SizeF& rhs) { 60 inline bool operator==(const SizeF& lhs, const SizeF& rhs) {
36 return lhs.width() == rhs.width() && lhs.height() == rhs.height(); 61 return lhs.width() == rhs.width() && lhs.height() == rhs.height();
37 } 62 }
38 63
39 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) { 64 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) {
40 return !(lhs == rhs); 65 return !(lhs == rhs);
41 } 66 }
42 67
43 GFX_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale); 68 GFX_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale);
44 69
45 inline SizeF ScaleSize(const SizeF& p, float scale) { 70 inline SizeF ScaleSize(const SizeF& p, float scale) {
46 return ScaleSize(p, scale, scale); 71 return ScaleSize(p, scale, scale);
47 } 72 }
48 73
49 #if !defined(COMPILER_MSVC) && !defined(__native_client__)
50 extern template class SizeBase<SizeF, float>;
51 #endif
52
53 // This is declared here for use in gtest-based unit tests but is defined in 74 // This is declared here for use in gtest-based unit tests but is defined in
54 // the gfx_test_support target. Depend on that to use this in your unit test. 75 // the gfx_test_support target. Depend on that to use this in your unit test.
55 // This should not be used in production code - call ToString() instead. 76 // This should not be used in production code - call ToString() instead.
56 void PrintTo(const SizeF& size, ::std::ostream* os); 77 void PrintTo(const SizeF& size, ::std::ostream* os);
57 78
58 } // namespace gfx 79 } // namespace gfx
59 80
60 #endif // UI_GFX_GEOMETRY_SIZE_F_H_ 81 #endif // UI_GFX_GEOMETRY_SIZE_F_H_
OLDNEW
« no previous file with comments | « ui/gfx/geometry/size_base.h ('k') | ui/gfx/geometry/size_f.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698