| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_SIZE_F_H_ | 5 // TODO(beng): remove once callsites are patched. |
| 6 #define UI_GFX_SIZE_F_H_ | 6 #include "ui/gfx/geometry/size_f.h" |
| 7 | 7 |
| 8 #include <string> | |
| 9 | |
| 10 #include "base/compiler_specific.h" | |
| 11 #include "ui/gfx/gfx_export.h" | |
| 12 #include "ui/gfx/size_base.h" | |
| 13 | |
| 14 namespace gfx { | |
| 15 | |
| 16 // A floating version of gfx::Size. | |
| 17 class GFX_EXPORT SizeF : public SizeBase<SizeF, float> { | |
| 18 public: | |
| 19 SizeF() : SizeBase<SizeF, float>(0, 0) {} | |
| 20 SizeF(float width, float height) : SizeBase<SizeF, float>(width, height) {} | |
| 21 ~SizeF() {} | |
| 22 | |
| 23 void Scale(float scale) { | |
| 24 Scale(scale, scale); | |
| 25 } | |
| 26 | |
| 27 void Scale(float x_scale, float y_scale) { | |
| 28 SetSize(width() * x_scale, height() * y_scale); | |
| 29 } | |
| 30 | |
| 31 std::string ToString() const; | |
| 32 }; | |
| 33 | |
| 34 inline bool operator==(const SizeF& lhs, const SizeF& rhs) { | |
| 35 return lhs.width() == rhs.width() && lhs.height() == rhs.height(); | |
| 36 } | |
| 37 | |
| 38 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) { | |
| 39 return !(lhs == rhs); | |
| 40 } | |
| 41 | |
| 42 GFX_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale); | |
| 43 | |
| 44 inline SizeF ScaleSize(const SizeF& p, float scale) { | |
| 45 return ScaleSize(p, scale, scale); | |
| 46 } | |
| 47 | |
| 48 #if !defined(COMPILER_MSVC) | |
| 49 extern template class SizeBase<SizeF, float>; | |
| 50 #endif | |
| 51 | |
| 52 } // namespace gfx | |
| 53 | |
| 54 #endif // UI_GFX_SIZE_F_H_ | |
| OLD | NEW |