| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2005 Nokia. All rights reserved. | 3 * Copyright (C) 2005 Nokia. 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 FloatRect_h | 27 #ifndef FloatRect_h |
| 28 #define FloatRect_h | 28 #define FloatRect_h |
| 29 | 29 |
| 30 #include "core/platform/graphics/FloatPoint.h" | 30 #include "core/platform/graphics/FloatPoint.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 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES | 35 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES |
| 36 typedef struct CGRect NSRect; | 36 typedef struct CGRect NSRect; |
| 37 #else | 37 #else |
| 38 typedef struct _NSRect NSRect; | 38 typedef struct _NSRect NSRect; |
| 39 #endif | 39 #endif |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 struct SkRect; | 42 struct SkRect; |
| 43 | 43 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 void scale(float s) { scale(s, s); } | 153 void scale(float s) { scale(s, s); } |
| 154 void scale(float sx, float sy); | 154 void scale(float sx, float sy); |
| 155 | 155 |
| 156 FloatRect transposedRect() const { return FloatRect(m_location.transposedPoi
nt(), m_size.transposedSize()); } | 156 FloatRect transposedRect() const { return FloatRect(m_location.transposedPoi
nt(), m_size.transposedSize()); } |
| 157 | 157 |
| 158 // Re-initializes this rectangle to fit the sets of passed points. | 158 // Re-initializes this rectangle to fit the sets of passed points. |
| 159 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1); | 159 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1); |
| 160 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoin
t& p2); | 160 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoin
t& p2); |
| 161 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoin
t& p2, const FloatPoint& p3); | 161 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoin
t& p2, const FloatPoint& p3); |
| 162 | 162 |
| 163 #if OS(DARWIN) | 163 #if OS(MACOSX) |
| 164 FloatRect(const CGRect&); | 164 FloatRect(const CGRect&); |
| 165 operator CGRect() const; | 165 operator CGRect() const; |
| 166 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | 166 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) |
| 167 FloatRect(const NSRect&); | 167 FloatRect(const NSRect&); |
| 168 operator NSRect() const; | 168 operator NSRect() const; |
| 169 #endif | 169 #endif |
| 170 #endif | 170 #endif |
| 171 | 171 |
| 172 operator SkRect() const; | 172 operator SkRect() const; |
| 173 | 173 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 IntRect enclosedIntRect(const FloatRect&); | 230 IntRect enclosedIntRect(const FloatRect&); |
| 231 | 231 |
| 232 IntRect roundedIntRect(const FloatRect&); | 232 IntRect roundedIntRect(const FloatRect&); |
| 233 | 233 |
| 234 // Map rect r from srcRect to an equivalent rect in destRect. | 234 // Map rect r from srcRect to an equivalent rect in destRect. |
| 235 FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect&
destRect); | 235 FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect&
destRect); |
| 236 | 236 |
| 237 } | 237 } |
| 238 | 238 |
| 239 #endif | 239 #endif |
| OLD | NEW |