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

Unified Diff: ui/gfx/geometry/insets.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/geometry/box_f.h ('k') | ui/gfx/geometry/insets.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/geometry/insets.h
diff --git a/ui/gfx/geometry/insets.h b/ui/gfx/geometry/insets.h
index 2fc0d62412b5e962f549e889c327996f83446eac..0318aa490237bdbe7c1d68464d04d8385748955f 100644
--- a/ui/gfx/geometry/insets.h
+++ b/ui/gfx/geometry/insets.h
@@ -14,25 +14,29 @@ namespace gfx {
class GFX_EXPORT Insets {
public:
- Insets();
- explicit Insets(int all);
- Insets(int vertical, int horizontal);
- Insets(int top, int left, int bottom, int right);
-
- ~Insets();
-
- int top() const { return top_; }
- int left() const { return left_; }
- int bottom() const { return bottom_; }
- int right() const { return right_; }
+ constexpr Insets() : top_(0), left_(0), bottom_(0), right_(0) {}
+ constexpr explicit Insets(int all)
+ : top_(all), left_(all), bottom_(all), right_(all) {}
+ constexpr Insets(int vertical, int horizontal)
+ : top_(vertical),
+ left_(horizontal),
+ bottom_(vertical),
+ right_(horizontal) {}
+ constexpr Insets(int top, int left, int bottom, int right)
+ : top_(top), left_(left), bottom_(bottom), right_(right) {}
+
+ constexpr int top() const { return top_; }
+ constexpr int left() const { return left_; }
+ constexpr int bottom() const { return bottom_; }
+ constexpr int right() const { return right_; }
// Returns the total width taken up by the insets, which is the sum of the
// left and right insets.
- int width() const { return left_ + right_; }
+ constexpr int width() const { return left_ + right_; }
// Returns the total height taken up by the insets, which is the sum of the
// top and bottom insets.
- int height() const { return top_ + bottom_; }
+ constexpr int height() const { return top_ + bottom_; }
// Returns true if the insets are empty.
bool IsEmpty() const { return width() == 0 && height() == 0; }
@@ -60,6 +64,13 @@ class GFX_EXPORT Insets {
right_ += insets.right_;
}
+ void operator-=(const Insets& insets) {
+ top_ -= insets.top_;
+ left_ -= insets.left_;
+ bottom_ -= insets.bottom_;
+ right_ -= insets.right_;
+ }
+
Insets operator-() const {
return Insets(-top_, -left_, -bottom_, -right_);
}
@@ -90,6 +101,16 @@ class GFX_EXPORT Insets {
int right_;
};
+inline Insets operator+(Insets lhs, const Insets& rhs) {
+ lhs += rhs;
+ return lhs;
+}
+
+inline Insets operator-(Insets lhs, const Insets& rhs) {
+ lhs -= rhs;
+ return lhs;
+}
+
} // namespace gfx
#endif // UI_GFX_GEOMETRY_INSETS_H_
« no previous file with comments | « ui/gfx/geometry/box_f.h ('k') | ui/gfx/geometry/insets.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698