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 #include "ui/gfx/size_f.h" | 5 #include "ui/gfx/size_f.h" |
6 | 6 |
| 7 #include "base/logging.h" |
7 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
8 #include "ui/gfx/size_base_impl.h" | |
9 | 9 |
10 namespace gfx { | 10 namespace gfx { |
11 | 11 |
12 template class SizeBase<SizeF, float>; | 12 template class SizeBase<SizeF, float>; |
13 | 13 |
14 SizeF::SizeF() : SizeBase<SizeF, float>(0, 0) {} | 14 SizeF::SizeF() : SizeBase<SizeF, float>(0, 0) {} |
15 | 15 |
16 SizeF::SizeF(float width, float height) | 16 SizeF::SizeF(float width, float height) : SizeBase<SizeF, float>(0, 0) { |
17 : SizeBase<SizeF, float>(width, height) { | 17 set_width(width); |
| 18 set_height(height); |
18 } | 19 } |
19 | 20 |
20 SizeF::~SizeF() {} | 21 SizeF::~SizeF() {} |
21 | 22 |
22 std::string SizeF::ToString() const { | 23 std::string SizeF::ToString() const { |
23 return base::StringPrintf("%fx%f", width(), height()); | 24 return base::StringPrintf("%fx%f", width(), height()); |
24 } | 25 } |
25 | 26 |
26 SizeF ScaleSize(const SizeF& s, float x_scale, float y_scale) { | 27 SizeF ScaleSize(const SizeF& s, float x_scale, float y_scale) { |
27 SizeF scaled_s(s); | 28 SizeF scaled_s(s); |
28 scaled_s.Scale(x_scale, y_scale); | 29 scaled_s.Scale(x_scale, y_scale); |
29 return scaled_s; | 30 return scaled_s; |
30 } | 31 } |
31 | 32 |
32 } // namespace gfx | 33 } // namespace gfx |
OLD | NEW |