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

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

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-event: mandol_line Created 5 years, 1 month 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/point.cc ('k') | ui/gfx/geometry/point_unittest.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_POINT_F_H_ 5 #ifndef UI_GFX_GEOMETRY_POINT_F_H_
6 #define UI_GFX_GEOMETRY_POINT_F_H_ 6 #define UI_GFX_GEOMETRY_POINT_F_H_
7 7
8 #include <iosfwd> 8 #include <iosfwd>
9 #include <string> 9 #include <string>
10 10
11 #include "ui/gfx/geometry/point.h"
11 #include "ui/gfx/geometry/vector2d_f.h" 12 #include "ui/gfx/geometry/vector2d_f.h"
12 #include "ui/gfx/gfx_export.h" 13 #include "ui/gfx/gfx_export.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 16
16 // A floating version of gfx::Point. 17 // A floating version of gfx::Point.
17 class GFX_EXPORT PointF { 18 class GFX_EXPORT PointF {
18 public: 19 public:
19 PointF() : x_(0.f), y_(0.f) {} 20 PointF() : x_(0.f), y_(0.f) {}
20 PointF(float x, float y) : x_(x), y_(y) {} 21 PointF(float x, float y) : x_(x), y_(y) {}
21 ~PointF() {} 22 ~PointF() {}
22 23
24 explicit PointF(const Point& p)
25 : PointF(static_cast<float>(p.x()), static_cast<float>(p.y())) {}
26
23 float x() const { return x_; } 27 float x() const { return x_; }
24 float y() const { return y_; } 28 float y() const { return y_; }
25 void set_x(float x) { x_ = x; } 29 void set_x(float x) { x_ = x; }
26 void set_y(float y) { y_ = y; } 30 void set_y(float y) { y_ = y; }
27 31
28 void SetPoint(float x, float y) { 32 void SetPoint(float x, float y) {
29 x_ = x; 33 x_ = x;
30 y_ = y; 34 y_ = y;
31 } 35 }
32 36
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 } 117 }
114 118
115 // This is declared here for use in gtest-based unit tests but is defined in 119 // This is declared here for use in gtest-based unit tests but is defined in
116 // the gfx_test_support target. Depend on that to use this in your unit test. 120 // the gfx_test_support target. Depend on that to use this in your unit test.
117 // This should not be used in production code - call ToString() instead. 121 // This should not be used in production code - call ToString() instead.
118 void PrintTo(const PointF& point, ::std::ostream* os); 122 void PrintTo(const PointF& point, ::std::ostream* os);
119 123
120 } // namespace gfx 124 } // namespace gfx
121 125
122 #endif // UI_GFX_GEOMETRY_POINT_F_H_ 126 #endif // UI_GFX_GEOMETRY_POINT_F_H_
OLDNEW
« no previous file with comments | « ui/gfx/geometry/point.cc ('k') | ui/gfx/geometry/point_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698