Chromium Code Reviews| 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 11 matching lines...) Expand all Loading... | |
| 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
| 23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/platform/graphics/IntRect.h" | 27 #include "core/platform/graphics/IntRect.h" |
| 28 | 28 |
| 29 #include <algorithm> | 29 #include <algorithm> |
| 30 #include "core/platform/graphics/FloatRect.h" | 30 #include "core/platform/graphics/FloatRect.h" |
| 31 #include "core/platform/graphics/LayoutRect.h" | 31 #include "core/platform/graphics/LayoutRect.h" |
| 32 #include "wtf/Vector.h" | |
|
pdr.
2013/06/07 17:17:14
Is this needed?
jbroman
2013/06/07 17:22:28
Since it's in the header, no. Didn't mean to add t
| |
| 32 | 33 |
| 33 using std::max; | 34 using std::max; |
| 34 using std::min; | 35 using std::min; |
| 35 | 36 |
| 36 namespace WebCore { | 37 namespace WebCore { |
| 37 | 38 |
| 38 IntRect::IntRect(const FloatRect& r) | 39 IntRect::IntRect(const FloatRect& r) |
| 39 : m_location(clampToInteger(r.x()), clampToInteger(r.y())) | 40 : m_location(clampToInteger(r.x()), clampToInteger(r.y())) |
| 40 , m_size(clampToInteger(r.width()), clampToInteger(r.height())) | 41 , m_size(clampToInteger(r.width()), clampToInteger(r.height())) |
| 41 { | 42 { |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 IntRect result; | 154 IntRect result; |
| 154 | 155 |
| 155 size_t count = rects.size(); | 156 size_t count = rects.size(); |
| 156 for (size_t i = 0; i < count; ++i) | 157 for (size_t i = 0; i < count; ++i) |
| 157 result.unite(rects[i]); | 158 result.unite(rects[i]); |
| 158 | 159 |
| 159 return result; | 160 return result; |
| 160 } | 161 } |
| 161 | 162 |
| 162 } // namespace WebCore | 163 } // namespace WebCore |
| OLD | NEW |