| 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 <string> | 9 #include <string> | 
| 9 | 10 | 
| 10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" | 
| 11 #include "ui/gfx/geometry/size_base.h" | 12 #include "ui/gfx/geometry/size_base.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::Size. | 17 // A floating version of gfx::Size. | 
| 17 class GFX_EXPORT SizeF : public SizeBase<SizeF, float> { | 18 class GFX_EXPORT SizeF : public SizeBase<SizeF, float> { | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 42 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); | 
| 43 | 44 | 
| 44 inline SizeF ScaleSize(const SizeF& p, float scale) { | 45 inline SizeF ScaleSize(const SizeF& p, float scale) { | 
| 45   return ScaleSize(p, scale, scale); | 46   return ScaleSize(p, scale, scale); | 
| 46 } | 47 } | 
| 47 | 48 | 
| 48 #if !defined(COMPILER_MSVC) | 49 #if !defined(COMPILER_MSVC) | 
| 49 extern template class SizeBase<SizeF, float>; | 50 extern template class SizeBase<SizeF, float>; | 
| 50 #endif | 51 #endif | 
| 51 | 52 | 
|  | 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. | 
|  | 55 // This should not be used in production code - call ToString() instead. | 
|  | 56 void PrintTo(const SizeF& size, ::std::ostream* os); | 
|  | 57 | 
| 52 }  // namespace gfx | 58 }  // namespace gfx | 
| 53 | 59 | 
| 54 #endif  // UI_GFX_GEOMETRY_SIZE_F_H_ | 60 #endif  // UI_GFX_GEOMETRY_SIZE_F_H_ | 
| OLD | NEW | 
|---|