| 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/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, Vector2d>; | 15 template class PointBase<Point, int, Vector2d>; |
| 16 | 16 |
| 17 Point::Point() : PointBase<Point, int, Vector2d>(0, 0) { | |
| 18 } | |
| 19 | |
| 20 Point::Point(int x, int y) : PointBase<Point, int, Vector2d>(x, y) { | |
| 21 } | |
| 22 | |
| 23 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 24 Point::Point(DWORD point) : PointBase<Point, int, Vector2d>(0, 0){ | 18 Point::Point(DWORD point) : PointBase<Point, int, Vector2d>(0, 0){ |
| 25 POINTS points = MAKEPOINTS(point); | 19 POINTS points = MAKEPOINTS(point); |
| 26 set_x(points.x); | 20 set_x(points.x); |
| 27 set_y(points.y); | 21 set_y(points.y); |
| 28 } | 22 } |
| 29 | 23 |
| 30 Point::Point(const POINT& point) | 24 Point::Point(const POINT& point) |
| 31 : PointBase<Point, int, Vector2d>(point.x, point.y) { | 25 : PointBase<Point, int, Vector2d>(point.x, point.y) { |
| 32 } | 26 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 51 CGPoint Point::ToCGPoint() const { | 45 CGPoint Point::ToCGPoint() const { |
| 52 return CGPointMake(x(), y()); | 46 return CGPointMake(x(), y()); |
| 53 } | 47 } |
| 54 #endif | 48 #endif |
| 55 | 49 |
| 56 std::string Point::ToString() const { | 50 std::string Point::ToString() const { |
| 57 return base::StringPrintf("%d,%d", x(), y()); | 51 return base::StringPrintf("%d,%d", x(), y()); |
| 58 } | 52 } |
| 59 | 53 |
| 60 } // namespace gfx | 54 } // namespace gfx |
| OLD | NEW |