| 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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 inline bool operator==(const IntRect& a, const IntRect& b) | 187 inline bool operator==(const IntRect& a, const IntRect& b) |
| 188 { | 188 { |
| 189 return a.location() == b.location() && a.size() == b.size(); | 189 return a.location() == b.location() && a.size() == b.size(); |
| 190 } | 190 } |
| 191 | 191 |
| 192 inline bool operator!=(const IntRect& a, const IntRect& b) | 192 inline bool operator!=(const IntRect& a, const IntRect& b) |
| 193 { | 193 { |
| 194 return a.location() != b.location() || a.size() != b.size(); | 194 return a.location() != b.location() || a.size() != b.size(); |
| 195 } | 195 } |
| 196 | 196 |
| 197 // FIXME: This method is here only to ease the transition to sub-pixel layout. I
t should | |
| 198 // be removed when we close http://webkit.org/b/60318 | |
| 199 inline IntRect enclosingIntRect(const IntRect& rect) | |
| 200 { | |
| 201 return rect; | |
| 202 } | |
| 203 | |
| 204 #if OS(DARWIN) | 197 #if OS(DARWIN) |
| 205 IntRect enclosingIntRect(const CGRect&); | 198 IntRect enclosingIntRect(const CGRect&); |
| 206 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | 199 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) |
| 207 IntRect enclosingIntRect(const NSRect&); | 200 IntRect enclosingIntRect(const NSRect&); |
| 208 #endif | 201 #endif |
| 209 #endif | 202 #endif |
| 210 | 203 |
| 211 } // namespace WebCore | 204 } // namespace WebCore |
| 212 | 205 |
| 213 #endif // IntRect_h | 206 #endif // IntRect_h |
| OLD | NEW |