OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. |
3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 void setX(int x) { m_x = x; } | 61 void setX(int x) { m_x = x; } |
62 void setY(int y) { m_y = y; } | 62 void setY(int y) { m_y = y; } |
63 | 63 |
64 void move(const IntSize& s) { move(s.width(), s.height()); } | 64 void move(const IntSize& s) { move(s.width(), s.height()); } |
65 void moveBy(const IntPoint& offset) { move(offset.x(), offset.y()); } | 65 void moveBy(const IntPoint& offset) { move(offset.x(), offset.y()); } |
66 void move(int dx, int dy) { | 66 void move(int dx, int dy) { |
67 m_x += dx; | 67 m_x += dx; |
68 m_y += dy; | 68 m_y += dy; |
69 } | 69 } |
70 void saturatedMove(int dx, int dy) { | 70 void saturatedMove(int dx, int dy) { |
71 m_x = saturatedAddition(m_x, dx); | 71 m_x = SaturatedAddition(m_x, dx); |
72 m_y = saturatedAddition(m_y, dy); | 72 m_y = SaturatedAddition(m_y, dy); |
73 } | 73 } |
74 | 74 |
75 void scale(float sx, float sy) { | 75 void scale(float sx, float sy) { |
76 m_x = lroundf(static_cast<float>(m_x * sx)); | 76 m_x = lroundf(static_cast<float>(m_x * sx)); |
77 m_y = lroundf(static_cast<float>(m_y * sy)); | 77 m_y = lroundf(static_cast<float>(m_y * sy)); |
78 } | 78 } |
79 | 79 |
80 IntPoint expandedTo(const IntPoint& other) const { | 80 IntPoint expandedTo(const IntPoint& other) const { |
81 return IntPoint(m_x > other.m_x ? m_x : other.m_x, | 81 return IntPoint(m_x > other.m_x ? m_x : other.m_x, |
82 m_y > other.m_y ? m_y : other.m_y); | 82 m_y > other.m_y ? m_y : other.m_y); |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 | 159 |
160 // Redeclared here to avoid ODR issues. | 160 // Redeclared here to avoid ODR issues. |
161 // See platform/testing/GeometryPrinters.h. | 161 // See platform/testing/GeometryPrinters.h. |
162 void PrintTo(const IntPoint&, std::ostream*); | 162 void PrintTo(const IntPoint&, std::ostream*); |
163 | 163 |
164 } // namespace blink | 164 } // namespace blink |
165 | 165 |
166 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::IntPoint); | 166 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::IntPoint); |
167 | 167 |
168 #endif // IntPoint_h | 168 #endif // IntPoint_h |
OLD | NEW |