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

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

Issue 2051343002: Make various gfx classes more amenable to use as compile-time constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete destructor Created 4 years, 6 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.h ('k') | ui/gfx/geometry/vector2d.h » ('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 <iosfwd> 8 #include <iosfwd>
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "ui/gfx/geometry/size.h" 12 #include "ui/gfx/geometry/size.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 { 18 class GFX_EXPORT SizeF {
19 public: 19 public:
20 SizeF() : width_(0.f), height_(0.f) {} 20 constexpr SizeF() : width_(0.f), height_(0.f) {}
21 SizeF(float width, float height) 21 constexpr SizeF(float width, float height)
22 : width_(width >= 0 ? width : 0), height_(height >= 0 ? height : 0) {} 22 : width_(width >= 0 ? width : 0), height_(height >= 0 ? height : 0) {}
23 ~SizeF() {}
24 23
25 explicit SizeF(const Size& size) 24 constexpr explicit SizeF(const Size& size)
26 : SizeF(static_cast<float>(size.width()), 25 : SizeF(static_cast<float>(size.width()),
27 static_cast<float>(size.height())) {} 26 static_cast<float>(size.height())) {}
28 27
29 float width() const { return width_; } 28 constexpr float width() const { return width_; }
30 float height() const { return height_; } 29 constexpr float height() const { return height_; }
31 30
32 void set_width(float width) { width_ = fmaxf(0, width); } 31 void set_width(float width) { width_ = fmaxf(0, width); }
33 void set_height(float height) { height_ = fmaxf(0, height); } 32 void set_height(float height) { height_ = fmaxf(0, height); }
34 33
35 float GetArea() const; 34 float GetArea() const;
36 35
37 void SetSize(float width, float height) { 36 void SetSize(float width, float height) {
38 set_width(width); 37 set_width(width);
39 set_height(height); 38 set_height(height);
40 } 39 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 75 }
77 76
78 // This is declared here for use in gtest-based unit tests but is defined in 77 // This is declared here for use in gtest-based unit tests but is defined in
79 // the gfx_test_support target. Depend on that to use this in your unit test. 78 // the gfx_test_support target. Depend on that to use this in your unit test.
80 // This should not be used in production code - call ToString() instead. 79 // This should not be used in production code - call ToString() instead.
81 void PrintTo(const SizeF& size, ::std::ostream* os); 80 void PrintTo(const SizeF& size, ::std::ostream* os);
82 81
83 } // namespace gfx 82 } // namespace gfx
84 83
85 #endif // UI_GFX_GEOMETRY_SIZE_F_H_ 84 #endif // UI_GFX_GEOMETRY_SIZE_F_H_
OLDNEW
« no previous file with comments | « ui/gfx/geometry/size.h ('k') | ui/gfx/geometry/vector2d.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698