OLD | NEW |
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_H_ | 5 #ifndef UI_GFX_GEOMETRY_SIZE_H_ |
6 #define UI_GFX_GEOMETRY_SIZE_H_ | 6 #define UI_GFX_GEOMETRY_SIZE_H_ |
7 | 7 |
8 #include <iosfwd> | 8 #include <iosfwd> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 Size& operator=(const CGSize& s); | 38 Size& operator=(const CGSize& s); |
39 #endif | 39 #endif |
40 | 40 |
41 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
42 SIZE ToSIZE() const; | 42 SIZE ToSIZE() const; |
43 #elif defined(OS_MACOSX) | 43 #elif defined(OS_MACOSX) |
44 CGSize ToCGSize() const; | 44 CGSize ToCGSize() const; |
45 #endif | 45 #endif |
46 | 46 |
47 operator SizeF() const { | 47 operator SizeF() const { |
48 return SizeF(width(), height()); | 48 return SizeF(static_cast<float>(width()), static_cast<float>(height())); |
49 } | 49 } |
50 | 50 |
51 std::string ToString() const; | 51 std::string ToString() const; |
52 }; | 52 }; |
53 | 53 |
54 inline bool operator==(const Size& lhs, const Size& rhs) { | 54 inline bool operator==(const Size& lhs, const Size& rhs) { |
55 return lhs.width() == rhs.width() && lhs.height() == rhs.height(); | 55 return lhs.width() == rhs.width() && lhs.height() == rhs.height(); |
56 } | 56 } |
57 | 57 |
58 inline bool operator!=(const Size& lhs, const Size& rhs) { | 58 inline bool operator!=(const Size& lhs, const Size& rhs) { |
59 return !(lhs == rhs); | 59 return !(lhs == rhs); |
60 } | 60 } |
61 | 61 |
62 #if !defined(COMPILER_MSVC) && !defined(__native_client__) | 62 #if !defined(COMPILER_MSVC) && !defined(__native_client__) |
63 extern template class SizeBase<Size, int>; | 63 extern template class SizeBase<Size, int>; |
64 #endif | 64 #endif |
65 | 65 |
66 // This is declared here for use in gtest-based unit tests but is defined in | 66 // This is declared here for use in gtest-based unit tests but is defined in |
67 // the gfx_test_support target. Depend on that to use this in your unit test. | 67 // the gfx_test_support target. Depend on that to use this in your unit test. |
68 // This should not be used in production code - call ToString() instead. | 68 // This should not be used in production code - call ToString() instead. |
69 void PrintTo(const Size& size, ::std::ostream* os); | 69 void PrintTo(const Size& size, ::std::ostream* os); |
70 | 70 |
71 } // namespace gfx | 71 } // namespace gfx |
72 | 72 |
73 #endif // UI_GFX_GEOMETRY_SIZE_H_ | 73 #endif // UI_GFX_GEOMETRY_SIZE_H_ |
OLD | NEW |