| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 return c; | 217 return c; |
| 218 } | 218 } |
| 219 | 219 |
| 220 inline FloatRect unionRect(const FloatRect& a, const FloatRect& b) | 220 inline FloatRect unionRect(const FloatRect& a, const FloatRect& b) |
| 221 { | 221 { |
| 222 FloatRect c = a; | 222 FloatRect c = a; |
| 223 c.unite(b); | 223 c.unite(b); |
| 224 return c; | 224 return c; |
| 225 } | 225 } |
| 226 | 226 |
| 227 FloatRect unionRect(const Vector<FloatRect>&); | 227 PLATFORM_EXPORT FloatRect unionRect(const Vector<FloatRect>&); |
| 228 | 228 |
| 229 inline FloatRect& operator+=(FloatRect& a, const FloatRect& b) | 229 inline FloatRect& operator+=(FloatRect& a, const FloatRect& b) |
| 230 { | 230 { |
| 231 a.move(b.x(), b.y()); | 231 a.move(b.x(), b.y()); |
| 232 a.setWidth(a.width() + b.width()); | 232 a.setWidth(a.width() + b.width()); |
| 233 a.setHeight(a.height() + b.height()); | 233 a.setHeight(a.height() + b.height()); |
| 234 return a; | 234 return a; |
| 235 } | 235 } |
| 236 | 236 |
| 237 inline FloatRect operator+(const FloatRect& a, const FloatRect& b) | 237 inline FloatRect operator+(const FloatRect& a, const FloatRect& b) |
| (...skipping 23 matching lines...) Expand all Loading... |
| 261 // Map supplied rect from srcRect to an equivalent rect in destRect. | 261 // Map supplied rect from srcRect to an equivalent rect in destRect. |
| 262 PLATFORM_EXPORT FloatRect mapRect(const FloatRect&, const FloatRect& srcRect, co
nst FloatRect& destRect); | 262 PLATFORM_EXPORT FloatRect mapRect(const FloatRect&, const FloatRect& srcRect, co
nst FloatRect& destRect); |
| 263 | 263 |
| 264 // Redeclared here to avoid ODR issues. | 264 // Redeclared here to avoid ODR issues. |
| 265 // See platform/testing/GeometryPrinters.h. | 265 // See platform/testing/GeometryPrinters.h. |
| 266 void PrintTo(const FloatRect&, std::ostream*); | 266 void PrintTo(const FloatRect&, std::ostream*); |
| 267 | 267 |
| 268 } // namespace blink | 268 } // namespace blink |
| 269 | 269 |
| 270 #endif | 270 #endif |
| OLD | NEW |