| Index: ui/gfx/mac/coordinate_conversion.mm
|
| diff --git a/ui/gfx/mac/coordinate_conversion.mm b/ui/gfx/mac/coordinate_conversion.mm
|
| index b2c41a455d6c96c4aa18e2928937c1c93f3cdb45..54b16e96053f4466ea9a90e6ef14221baf5ea184 100644
|
| --- a/ui/gfx/mac/coordinate_conversion.mm
|
| +++ b/ui/gfx/mac/coordinate_conversion.mm
|
| @@ -6,6 +6,7 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include "ui/gfx/geometry/point.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| namespace gfx {
|
| @@ -20,18 +21,25 @@ CGFloat PrimaryDisplayHeight() {
|
|
|
| } // namespace
|
|
|
| -NSRect ScreenRectToNSRect(const gfx::Rect& rect) {
|
| +NSRect ScreenRectToNSRect(const Rect& rect) {
|
| return NSMakeRect(rect.x(),
|
| PrimaryDisplayHeight() - rect.y() - rect.height(),
|
| rect.width(),
|
| rect.height());
|
| }
|
|
|
| -gfx::Rect ScreenRectFromNSRect(const NSRect& rect) {
|
| - return gfx::Rect(rect.origin.x,
|
| - PrimaryDisplayHeight() - rect.origin.y - rect.size.height,
|
| - rect.size.width,
|
| - rect.size.height);
|
| +Rect ScreenRectFromNSRect(const NSRect& rect) {
|
| + return Rect(rect.origin.x,
|
| + PrimaryDisplayHeight() - rect.origin.y - rect.size.height,
|
| + rect.size.width, rect.size.height);
|
| +}
|
| +
|
| +NSPoint ScreenPointToNSPoint(const Point& point) {
|
| + return NSMakePoint(point.x(), PrimaryDisplayHeight() - point.y());
|
| +}
|
| +
|
| +Point ScreenPointFromNSPoint(const NSPoint& point) {
|
| + return Point(point.x, PrimaryDisplayHeight() - point.y);
|
| }
|
|
|
| } // namespace gfx
|
|
|