| 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 |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/numerics/safe_math.h" | 12 #include "base/numerics/safe_math.h" |
| 13 #include "build/build_config.h" |
| 13 #include "ui/gfx/gfx_export.h" | 14 #include "ui/gfx/gfx_export.h" |
| 14 | 15 |
| 15 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
| 16 typedef struct tagSIZE SIZE; | 17 typedef struct tagSIZE SIZE; |
| 17 #elif defined(OS_MACOSX) | 18 #elif defined(OS_MACOSX) |
| 18 typedef struct CGSize CGSize; | 19 typedef struct CGSize CGSize; |
| 19 #endif | 20 #endif |
| 20 | 21 |
| 21 namespace gfx { | 22 namespace gfx { |
| 22 | 23 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 float y_scale); | 96 float y_scale); |
| 96 GFX_EXPORT Size ScaleToFlooredSize(const Size& size, float x_scale); | 97 GFX_EXPORT Size ScaleToFlooredSize(const Size& size, float x_scale); |
| 97 GFX_EXPORT Size ScaleToRoundedSize(const Size& size, | 98 GFX_EXPORT Size ScaleToRoundedSize(const Size& size, |
| 98 float x_scale, | 99 float x_scale, |
| 99 float y_scale); | 100 float y_scale); |
| 100 GFX_EXPORT Size ScaleToRoundedSize(const Size& size, float x_scale); | 101 GFX_EXPORT Size ScaleToRoundedSize(const Size& size, float x_scale); |
| 101 | 102 |
| 102 } // namespace gfx | 103 } // namespace gfx |
| 103 | 104 |
| 104 #endif // UI_GFX_GEOMETRY_SIZE_H_ | 105 #endif // UI_GFX_GEOMETRY_SIZE_H_ |
| OLD | NEW |