| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006, 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef IntRect_h | 26 #ifndef IntRect_h |
| 27 #define IntRect_h | 27 #define IntRect_h |
| 28 | 28 |
| 29 #include "core/platform/graphics/IntPoint.h" | 29 #include "core/platform/graphics/IntPoint.h" |
| 30 #include "wtf/FastAllocBase.h" | 30 #include "wtf/FastAllocBase.h" |
| 31 #include "wtf/Vector.h" | 31 #include "wtf/Vector.h" |
| 32 | 32 |
| 33 #if OS(DARWIN) | 33 #if OS(MACOSX) |
| 34 typedef struct CGRect CGRect; | 34 typedef struct CGRect CGRect; |
| 35 | 35 |
| 36 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES | 36 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES |
| 37 typedef struct CGRect NSRect; | 37 typedef struct CGRect NSRect; |
| 38 #else | 38 #else |
| 39 typedef struct _NSRect NSRect; | 39 typedef struct _NSRect NSRect; |
| 40 #endif | 40 #endif |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 struct SkRect; | 43 struct SkRect; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 m_size.setHeight(m_size.height() + dy + dy); | 145 m_size.setHeight(m_size.height() + dy + dy); |
| 146 } | 146 } |
| 147 void inflate(int d) { inflateX(d); inflateY(d); } | 147 void inflate(int d) { inflateX(d); inflateY(d); } |
| 148 void scale(float s); | 148 void scale(float s); |
| 149 | 149 |
| 150 IntSize differenceToPoint(const IntPoint&) const; | 150 IntSize differenceToPoint(const IntPoint&) const; |
| 151 int distanceSquaredToPoint(const IntPoint& p) const { return differenceToPoi
nt(p).diagonalLengthSquared(); } | 151 int distanceSquaredToPoint(const IntPoint& p) const { return differenceToPoi
nt(p).diagonalLengthSquared(); } |
| 152 | 152 |
| 153 IntRect transposedRect() const { return IntRect(m_location.transposedPoint()
, m_size.transposedSize()); } | 153 IntRect transposedRect() const { return IntRect(m_location.transposedPoint()
, m_size.transposedSize()); } |
| 154 | 154 |
| 155 #if OS(DARWIN) | 155 #if OS(MACOSX) |
| 156 operator CGRect() const; | 156 operator CGRect() const; |
| 157 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | 157 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) |
| 158 operator NSRect() const; | 158 operator NSRect() const; |
| 159 #endif | 159 #endif |
| 160 #endif | 160 #endif |
| 161 | 161 |
| 162 operator SkRect() const; | 162 operator SkRect() const; |
| 163 operator SkIRect() const; | 163 operator SkIRect() const; |
| 164 | 164 |
| 165 private: | 165 private: |
| (...skipping 20 matching lines...) Expand all Loading... |
| 186 inline bool operator==(const IntRect& a, const IntRect& b) | 186 inline bool operator==(const IntRect& a, const IntRect& b) |
| 187 { | 187 { |
| 188 return a.location() == b.location() && a.size() == b.size(); | 188 return a.location() == b.location() && a.size() == b.size(); |
| 189 } | 189 } |
| 190 | 190 |
| 191 inline bool operator!=(const IntRect& a, const IntRect& b) | 191 inline bool operator!=(const IntRect& a, const IntRect& b) |
| 192 { | 192 { |
| 193 return a.location() != b.location() || a.size() != b.size(); | 193 return a.location() != b.location() || a.size() != b.size(); |
| 194 } | 194 } |
| 195 | 195 |
| 196 #if OS(DARWIN) | 196 #if OS(MACOSX) |
| 197 IntRect enclosingIntRect(const CGRect&); | 197 IntRect enclosingIntRect(const CGRect&); |
| 198 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | 198 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) |
| 199 IntRect enclosingIntRect(const NSRect&); | 199 IntRect enclosingIntRect(const NSRect&); |
| 200 #endif | 200 #endif |
| 201 #endif | 201 #endif |
| 202 | 202 |
| 203 } // namespace WebCore | 203 } // namespace WebCore |
| 204 | 204 |
| 205 #endif // IntRect_h | 205 #endif // IntRect_h |
| OLD | NEW |