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

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

Issue 2749513011: Stabilize empty rect handling in EnclosingRect. (Closed)
Patch Set: Use size in Enclosing computation Created 3 years, 9 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
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 <limits>
Peter Mayo 2017/03/20 18:53:50 remove
6
5 #include "ui/gfx/geometry/size_f.h" 7 #include "ui/gfx/geometry/size_f.h"
6 8
7 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
8 10
9 namespace gfx { 11 namespace gfx {
10 12
11 float SizeF::GetArea() const { 13 float SizeF::GetArea() const {
12 return width() * height(); 14 return width() * height();
13 } 15 }
14 16
15 void SizeF::Enlarge(float grow_width, float grow_height) { 17 void SizeF::Enlarge(float grow_width, float grow_height) {
16 SetSize(width() + grow_width, height() + grow_height); 18 SetSize(width() + grow_width, height() + grow_height);
17 } 19 }
18 20
19 void SizeF::SetToMin(const SizeF& other) { 21 void SizeF::SetToMin(const SizeF& other) {
20 width_ = width() <= other.width() ? width() : other.width(); 22 set_width(width() <= other.width() ? width() : other.width());
21 height_ = height() <= other.height() ? height() : other.height(); 23 set_height(height() <= other.height() ? height() : other.height());
22 } 24 }
23 25
24 void SizeF::SetToMax(const SizeF& other) { 26 void SizeF::SetToMax(const SizeF& other) {
25 width_ = width() >= other.width() ? width() : other.width(); 27 set_width(width() >= other.width() ? width() : other.width());
26 height_ = height() >= other.height() ? height() : other.height(); 28 set_height(height() >= other.height() ? height() : other.height());
27 } 29 }
28 30
29 std::string SizeF::ToString() const { 31 std::string SizeF::ToString() const {
30 return base::StringPrintf("%fx%f", width(), height()); 32 return base::StringPrintf("%fx%f", width(), height());
31 } 33 }
32 34
33 SizeF ScaleSize(const SizeF& s, float x_scale, float y_scale) { 35 SizeF ScaleSize(const SizeF& s, float x_scale, float y_scale) {
34 SizeF scaled_s(s); 36 SizeF scaled_s(s);
35 scaled_s.Scale(x_scale, y_scale); 37 scaled_s.Scale(x_scale, y_scale);
36 return scaled_s; 38 return scaled_s;
37 } 39 }
38 40
39 } // namespace gfx 41 } // namespace gfx
OLDNEW
« ui/gfx/geometry/rect_conversions.cc ('K') | « ui/gfx/geometry/size_f.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698