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

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

Issue 642343003: gfx: De-templatize the gfx::Point and gfx::PointF classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: inlines-point: rebase 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/point_f.h ('k') | ui/gfx/geometry/point_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/point_f.h" 5 #include "ui/gfx/geometry/point_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 PointBase<PointF, float, Vector2dF>; 11 void PointF::SetToMin(const PointF& other) {
12 x_ = x_ <= other.x_ ? x_ : other.x_;
13 y_ = y_ <= other.y_ ? y_ : other.y_;
14 }
15
16 void PointF::SetToMax(const PointF& other) {
17 x_ = x_ >= other.x_ ? x_ : other.x_;
18 y_ = y_ >= other.y_ ? y_ : other.y_;
19 }
12 20
13 std::string PointF::ToString() const { 21 std::string PointF::ToString() const {
14 return base::StringPrintf("%f,%f", x(), y()); 22 return base::StringPrintf("%f,%f", x(), y());
15 } 23 }
16 24
17 PointF ScalePoint(const PointF& p, float x_scale, float y_scale) { 25 PointF ScalePoint(const PointF& p, float x_scale, float y_scale) {
18 PointF scaled_p(p); 26 PointF scaled_p(p);
19 scaled_p.Scale(x_scale, y_scale); 27 scaled_p.Scale(x_scale, y_scale);
20 return scaled_p; 28 return scaled_p;
21 } 29 }
22 30
23 31
24 } // namespace gfx 32 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/geometry/point_f.h ('k') | ui/gfx/geometry/point_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698