| 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_SIZE_F_H_ | 5 #ifndef UI_GFX_SIZE_F_H_ |
| 6 #define UI_GFX_SIZE_F_H_ | 6 #define UI_GFX_SIZE_F_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ui/base/ui_export.h" | 10 #include "ui/base/ui_export.h" |
| 11 #include "ui/gfx/size.h" | |
| 12 #include "ui/gfx/size_base.h" | 11 #include "ui/gfx/size_base.h" |
| 13 | 12 |
| 14 namespace gfx { | 13 namespace gfx { |
| 15 | 14 |
| 16 // A floating version of gfx::Size. | 15 // A floating version of gfx::Size. |
| 17 class UI_EXPORT SizeF : public SizeBase<SizeF, float> { | 16 class UI_EXPORT SizeF : public SizeBase<SizeF, float> { |
| 18 public: | 17 public: |
| 19 SizeF(); | 18 SizeF(); |
| 20 SizeF(float width, float height); | 19 SizeF(float width, float height); |
| 21 ~SizeF(); | 20 ~SizeF(); |
| 22 | 21 |
| 23 Size ToSize() const; | |
| 24 | |
| 25 std::string ToString() const; | 22 std::string ToString() const; |
| 26 }; | 23 }; |
| 27 | 24 |
| 28 #if !defined(COMPILER_MSVC) | 25 #if !defined(COMPILER_MSVC) |
| 29 extern template class SizeBase<SizeF, float>; | 26 extern template class SizeBase<SizeF, float>; |
| 30 #endif | 27 #endif |
| 31 | 28 |
| 32 } // namespace gfx | 29 } // namespace gfx |
| 33 | 30 |
| 34 #endif // UI_GFX_SIZE_F_H_ | 31 #endif // UI_GFX_SIZE_F_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10993094:
Make adding and subtracting gfx:: point types simpler. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src