Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: Source/core/platform/graphics/IntPoint.h

Issue 18551004: Miscellaneous cleanup to reduce number of includes in platform/graphics/ Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 10 matching lines...) Expand all
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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 IntPoint_h 27 #ifndef IntPoint_h
28 #define IntPoint_h 28 #define IntPoint_h
29 29
30 #include "core/platform/graphics/IntSize.h" 30 #include "core/platform/graphics/IntSize.h"
31 #include "wtf/MathExtras.h"
32 #include "wtf/Platform.h" 31 #include "wtf/Platform.h"
33 32
34 #if OS(DARWIN) 33 #if OS(DARWIN)
35 typedef struct CGPoint CGPoint; 34 typedef struct CGPoint CGPoint;
36 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 35 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
37 typedef struct CGPoint NSPoint; 36 typedef struct CGPoint NSPoint;
38 #else 37 #else
39 typedef struct _NSPoint NSPoint; 38 typedef struct _NSPoint NSPoint;
40 #endif 39 #endif
41 #endif 40 #endif
(...skipping 10 matching lines...) Expand all
52 51
53 int x() const { return m_x; } 52 int x() const { return m_x; }
54 int y() const { return m_y; } 53 int y() const { return m_y; }
55 54
56 void setX(int x) { m_x = x; } 55 void setX(int x) { m_x = x; }
57 void setY(int y) { m_y = y; } 56 void setY(int y) { m_y = y; }
58 57
59 void move(const IntSize& s) { move(s.width(), s.height()); } 58 void move(const IntSize& s) { move(s.width(), s.height()); }
60 void moveBy(const IntPoint& offset) { move(offset.x(), offset.y()); } 59 void moveBy(const IntPoint& offset) { move(offset.x(), offset.y()); }
61 void move(int dx, int dy) { m_x += dx; m_y += dy; } 60 void move(int dx, int dy) { m_x += dx; m_y += dy; }
62 void scale(float sx, float sy) 61 void scale(float sx, float sy);
63 { 62
64 m_x = lroundf(static_cast<float>(m_x * sx));
65 m_y = lroundf(static_cast<float>(m_y * sy));
66 }
67
68 IntPoint expandedTo(const IntPoint& other) const 63 IntPoint expandedTo(const IntPoint& other) const
69 { 64 {
70 return IntPoint(m_x > other.m_x ? m_x : other.m_x, 65 return IntPoint(m_x > other.m_x ? m_x : other.m_x,
71 m_y > other.m_y ? m_y : other.m_y); 66 m_y > other.m_y ? m_y : other.m_y);
72 } 67 }
73 68
74 IntPoint shrunkTo(const IntPoint& other) const 69 IntPoint shrunkTo(const IntPoint& other) const
75 { 70 {
76 return IntPoint(m_x < other.m_x ? m_x : other.m_x, 71 return IntPoint(m_x < other.m_x ? m_x : other.m_x,
77 m_y < other.m_y ? m_y : other.m_y); 72 m_y < other.m_y ? m_y : other.m_y);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 151 }
157 152
158 inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const 153 inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const
159 { 154 {
160 return ((*this) - point).diagonalLengthSquared(); 155 return ((*this) - point).diagonalLengthSquared();
161 } 156 }
162 157
163 } // namespace WebCore 158 } // namespace WebCore
164 159
165 #endif // IntPoint_h 160 #endif // IntPoint_h
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/ImageOrientation.cpp ('k') | Source/core/platform/graphics/IntPoint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698