Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Side by Side Diff: ui/gfx/geometry/size_f.cc

Issue 662273002: gfx:: De-templatize Size and SizeF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: inlines-size: . Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/geometry/size_f.h ('k') | ui/gfx/geometry/size_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/geometry/size_f.h" 5 #include "ui/gfx/geometry/size_f.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 8
9 namespace gfx { 9 namespace gfx {
10 10
11 template class SizeBase<SizeF, float>; 11 float SizeF::GetArea() const {
12 return width() * height();
13 }
14
15 void SizeF::Enlarge(float grow_width, float grow_height) {
16 SetSize(width() + grow_width, height() + grow_height);
17 }
18
19 void SizeF::SetToMin(const SizeF& other) {
20 width_ = width() <= other.width() ? width() : other.width();
21 height_ = height() <= other.height() ? height() : other.height();
22 }
23
24 void SizeF::SetToMax(const SizeF& other) {
25 width_ = width() >= other.width() ? width() : other.width();
26 height_ = height() >= other.height() ? height() : other.height();
27 }
12 28
13 std::string SizeF::ToString() const { 29 std::string SizeF::ToString() const {
14 return base::StringPrintf("%fx%f", width(), height()); 30 return base::StringPrintf("%fx%f", width(), height());
15 } 31 }
16 32
17 SizeF ScaleSize(const SizeF& s, float x_scale, float y_scale) { 33 SizeF ScaleSize(const SizeF& s, float x_scale, float y_scale) {
18 SizeF scaled_s(s); 34 SizeF scaled_s(s);
19 scaled_s.Scale(x_scale, y_scale); 35 scaled_s.Scale(x_scale, y_scale);
20 return scaled_s; 36 return scaled_s;
21 } 37 }
22 38
23 } // namespace gfx 39 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/geometry/size_f.h ('k') | ui/gfx/geometry/size_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698