| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #ifndef IntPoint_h | 27 #ifndef IntPoint_h |
| 28 #define IntPoint_h | 28 #define IntPoint_h |
| 29 | 29 |
| 30 #include "core/platform/graphics/IntSize.h" | 30 #include "core/platform/graphics/IntSize.h" |
| 31 #include "wtf/MathExtras.h" | 31 #include "wtf/MathExtras.h" |
| 32 | 32 |
| 33 #if OS(DARWIN) | 33 #if OS(MACOSX) |
| 34 typedef struct CGPoint CGPoint; | 34 typedef struct CGPoint CGPoint; |
| 35 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES | 35 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES |
| 36 typedef struct CGPoint NSPoint; | 36 typedef struct CGPoint NSPoint; |
| 37 #else | 37 #else |
| 38 typedef struct _NSPoint NSPoint; | 38 typedef struct _NSPoint NSPoint; |
| 39 #endif | 39 #endif |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 void clampNegativeToZero() | 81 void clampNegativeToZero() |
| 82 { | 82 { |
| 83 *this = expandedTo(zero()); | 83 *this = expandedTo(zero()); |
| 84 } | 84 } |
| 85 | 85 |
| 86 IntPoint transposedPoint() const | 86 IntPoint transposedPoint() const |
| 87 { | 87 { |
| 88 return IntPoint(m_y, m_x); | 88 return IntPoint(m_y, m_x); |
| 89 } | 89 } |
| 90 | 90 |
| 91 #if OS(DARWIN) | 91 #if OS(MACOSX) |
| 92 explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lo
ssy | 92 explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lo
ssy |
| 93 operator CGPoint() const; | 93 operator CGPoint() const; |
| 94 | 94 |
| 95 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | 95 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) |
| 96 explicit IntPoint(const NSPoint&); // don't do this implicitly since it's lo
ssy | 96 explicit IntPoint(const NSPoint&); // don't do this implicitly since it's lo
ssy |
| 97 operator NSPoint() const; | 97 operator NSPoint() const; |
| 98 #endif | 98 #endif |
| 99 #endif | 99 #endif |
| 100 | 100 |
| 101 private: | 101 private: |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 155 } |
| 156 | 156 |
| 157 inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const | 157 inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const |
| 158 { | 158 { |
| 159 return ((*this) - point).diagonalLengthSquared(); | 159 return ((*this) - point).diagonalLengthSquared(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 } // namespace WebCore | 162 } // namespace WebCore |
| 163 | 163 |
| 164 #endif // IntPoint_h | 164 #endif // IntPoint_h |
| OLD | NEW |