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

Side by Side Diff: ui/gfx/point.cc

Issue 10993094: Make adding and subtracting gfx:: point types simpler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove some patch noise Created 8 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 | Annotate | Revision Log
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/point.h" 5 #include "ui/gfx/point.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 14
15 template class PointBase<Point, int>; 15 template class PointBase<Point, int>;
16 16
17 Point::Point() : PointBase<Point, int>(0, 0) { 17 Point::Point() : PointBase<Point, int>(0, 0) {
18 } 18 }
19 19
20 Point::Point(int x, int y) : PointBase<Point, int>(x, y) { 20 Point::Point(int x, int y) : PointBase<Point, int>(x, y) {
21 } 21 }
22 22
23 Point::Point(const Point& other)
24 : PointBase<Point, int>(other.x(), other.y()) {
25 }
26
23 #if defined(OS_WIN) 27 #if defined(OS_WIN)
24 Point::Point(DWORD point) : PointBase<Point, int>(0, 0){ 28 Point::Point(DWORD point) : PointBase<Point, int>(0, 0){
25 POINTS points = MAKEPOINTS(point); 29 POINTS points = MAKEPOINTS(point);
26 set_x(points.x); 30 set_x(points.x);
27 set_y(points.y); 31 set_y(points.y);
28 } 32 }
29 33
30 Point::Point(const POINT& point) : PointBase<Point, int>(point.x, point.y) { 34 Point::Point(const POINT& point) : PointBase<Point, int>(point.x, point.y) {
31 } 35 }
32 36
(...skipping 16 matching lines...) Expand all
49 CGPoint Point::ToCGPoint() const { 53 CGPoint Point::ToCGPoint() const {
50 return CGPointMake(x(), y()); 54 return CGPointMake(x(), y());
51 } 55 }
52 #endif 56 #endif
53 57
54 std::string Point::ToString() const { 58 std::string Point::ToString() const {
55 return base::StringPrintf("%d,%d", x(), y()); 59 return base::StringPrintf("%d,%d", x(), y());
56 } 60 }
57 61
58 } // namespace gfx 62 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698