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

Unified Diff: ui/gfx/rect.h

Issue 11028127: Implicit coversion operators from integer geometry types to floating point. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/point_unittest.cc ('k') | ui/gfx/rect_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/rect.h
diff --git a/ui/gfx/rect.h b/ui/gfx/rect.h
index 36f822cd353daf3e28f4932ed7a7c82113a5bb6e..0f0794875efd5788b08caee1a0dd51f2b0186d03 100644
--- a/ui/gfx/rect.h
+++ b/ui/gfx/rect.h
@@ -68,7 +68,7 @@ class UI_EXPORT Rect : public RectBase<Rect, Point, Size, Insets, int> {
CGRect ToCGRect() const;
#endif
- RectF ToRectF() const {
+ operator RectF() const {
return RectF(origin().x(), origin().y(), size().width(), size().height());
}
@@ -77,12 +77,21 @@ class UI_EXPORT Rect : public RectBase<Rect, Point, Size, Insets, int> {
}
RectF Scale(float x_scale, float y_scale) const WARN_UNUSED_RESULT {
- return ToRectF().Scale(x_scale, y_scale);
+ RectF original = *this;
+ return original.Scale(x_scale, y_scale);
}
std::string ToString() const;
};
+inline bool operator==(const Rect& lhs, const Rect& rhs) {
+ return lhs.origin() == rhs.origin() && lhs.size() == rhs.size();
+}
+
+inline bool operator!=(const Rect& lhs, const Rect& rhs) {
+ return !(lhs == rhs);
+}
+
#if !defined(COMPILER_MSVC)
extern template class RectBase<Rect, Point, Size, Insets, int>;
#endif
« no previous file with comments | « ui/gfx/point_unittest.cc ('k') | ui/gfx/rect_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698