| 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/geometry/point.h" | 5 #include "ui/gfx/geometry/point.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #elif defined(OS_IOS) | 9 #elif defined(OS_IOS) |
| 10 #include <CoreGraphics/CoreGraphics.h> | 10 #include <CoreGraphics/CoreGraphics.h> |
| 11 #elif defined(OS_MACOSX) | 11 #elif defined(OS_MACOSX) |
| 12 #include <ApplicationServices/ApplicationServices.h> | 12 #include <ApplicationServices/ApplicationServices.h> |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "ui/gfx/geometry/point_conversions.h" | 16 #include "ui/gfx/geometry/point_conversions.h" |
| 17 #include "ui/gfx/geometry/point_f.h" |
| 17 | 18 |
| 18 namespace gfx { | 19 namespace gfx { |
| 19 | 20 |
| 20 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 21 Point::Point(DWORD point) { | 22 Point::Point(DWORD point) { |
| 22 POINTS points = MAKEPOINTS(point); | 23 POINTS points = MAKEPOINTS(point); |
| 23 x_ = points.x; | 24 x_ = points.x; |
| 24 y_ = points.y; | 25 y_ = points.y; |
| 25 } | 26 } |
| 26 | 27 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 return ToRoundedPoint(ScalePoint(gfx::PointF(point), x_scale, y_scale)); | 95 return ToRoundedPoint(ScalePoint(gfx::PointF(point), x_scale, y_scale)); |
| 95 } | 96 } |
| 96 | 97 |
| 97 Point ScaleToRoundedPoint(const Point& point, float scale) { | 98 Point ScaleToRoundedPoint(const Point& point, float scale) { |
| 98 if (scale == 1.f) | 99 if (scale == 1.f) |
| 99 return point; | 100 return point; |
| 100 return ToRoundedPoint(ScalePoint(gfx::PointF(point), scale, scale)); | 101 return ToRoundedPoint(ScalePoint(gfx::PointF(point), scale, scale)); |
| 101 } | 102 } |
| 102 | 103 |
| 103 } // namespace gfx | 104 } // namespace gfx |
| OLD | NEW |