| 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_F_H_ | 5 #ifndef UI_GFX_GEOMETRY_SIZE_F_H_ |
| 6 #define UI_GFX_GEOMETRY_SIZE_F_H_ | 6 #define UI_GFX_GEOMETRY_SIZE_F_H_ |
| 7 | 7 |
| 8 #include <iosfwd> | 8 #include <iosfwd> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) { | 39 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) { |
| 40 return !(lhs == rhs); | 40 return !(lhs == rhs); |
| 41 } | 41 } |
| 42 | 42 |
| 43 GFX_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale); | 43 GFX_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale); |
| 44 | 44 |
| 45 inline SizeF ScaleSize(const SizeF& p, float scale) { | 45 inline SizeF ScaleSize(const SizeF& p, float scale) { |
| 46 return ScaleSize(p, scale, scale); | 46 return ScaleSize(p, scale, scale); |
| 47 } | 47 } |
| 48 | 48 |
| 49 #if !defined(COMPILER_MSVC) | 49 #if !defined(COMPILER_MSVC) && !defined(__native_client__) |
| 50 extern template class SizeBase<SizeF, float>; | 50 extern template class SizeBase<SizeF, float>; |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 // This is declared here for use in gtest-based unit tests but is defined in | 53 // This is declared here for use in gtest-based unit tests but is defined in |
| 54 // the gfx_test_support target. Depend on that to use this in your unit test. | 54 // the gfx_test_support target. Depend on that to use this in your unit test. |
| 55 // This should not be used in production code - call ToString() instead. | 55 // This should not be used in production code - call ToString() instead. |
| 56 void PrintTo(const SizeF& size, ::std::ostream* os); | 56 void PrintTo(const SizeF& size, ::std::ostream* os); |
| 57 | 57 |
| 58 } // namespace gfx | 58 } // namespace gfx |
| 59 | 59 |
| 60 #endif // UI_GFX_GEOMETRY_SIZE_F_H_ | 60 #endif // UI_GFX_GEOMETRY_SIZE_F_H_ |
| OLD | NEW |