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

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

Issue 649203003: Type conversion fixes, ui/gfx/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile 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
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_H_ 5 #ifndef UI_GFX_GEOMETRY_POINT_H_
6 #define UI_GFX_GEOMETRY_POINT_H_ 6 #define UI_GFX_GEOMETRY_POINT_H_
7 7
8 #include <iosfwd> 8 #include <iosfwd>
9 #include <string> 9 #include <string>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 ~Point() {} 43 ~Point() {}
44 44
45 #if defined(OS_WIN) 45 #if defined(OS_WIN)
46 POINT ToPOINT() const; 46 POINT ToPOINT() const;
47 #elif defined(OS_MACOSX) 47 #elif defined(OS_MACOSX)
48 CGPoint ToCGPoint() const; 48 CGPoint ToCGPoint() const;
49 #endif 49 #endif
50 50
51 operator PointF() const { 51 operator PointF() const {
52 return PointF(x(), y()); 52 return PointF(static_cast<float>(x()), static_cast<float>(y()));
53 } 53 }
54 54
55 // Returns a string representation of point. 55 // Returns a string representation of point.
56 std::string ToString() const; 56 std::string ToString() const;
57 }; 57 };
58 58
59 inline bool operator==(const Point& lhs, const Point& rhs) { 59 inline bool operator==(const Point& lhs, const Point& rhs) {
60 return lhs.x() == rhs.x() && lhs.y() == rhs.y(); 60 return lhs.x() == rhs.x() && lhs.y() == rhs.y();
61 } 61 }
62 62
(...skipping 26 matching lines...) Expand all
89 #endif 89 #endif
90 90
91 // This is declared here for use in gtest-based unit tests but is defined in 91 // This is declared here for use in gtest-based unit tests but is defined in
92 // the gfx_test_support target. Depend on that to use this in your unit test. 92 // the gfx_test_support target. Depend on that to use this in your unit test.
93 // This should not be used in production code - call ToString() instead. 93 // This should not be used in production code - call ToString() instead.
94 void PrintTo(const Point& point, ::std::ostream* os); 94 void PrintTo(const Point& point, ::std::ostream* os);
95 95
96 } // namespace gfx 96 } // namespace gfx
97 97
98 #endif // UI_GFX_GEOMETRY_POINT_H_ 98 #endif // UI_GFX_GEOMETRY_POINT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698