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

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

Issue 23003024: Revert r156542 "Do not include "wtf/Platform.h" directly. " (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/platform/graphics/IntSize.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 11 matching lines...) Expand all
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" 31 #include "wtf/MathExtras.h"
32 #include "wtf/Platform.h"
32 33
33 #if OS(DARWIN) 34 #if OS(DARWIN)
34 typedef struct CGPoint CGPoint; 35 typedef struct CGPoint CGPoint;
35 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 36 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
36 typedef struct CGPoint NSPoint; 37 typedef struct CGPoint NSPoint;
37 #else 38 #else
38 typedef struct _NSPoint NSPoint; 39 typedef struct _NSPoint NSPoint;
39 #endif 40 #endif
40 #endif 41 #endif
41 42
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } 156 }
156 157
157 inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const 158 inline int IntPoint::distanceSquaredToPoint(const IntPoint& point) const
158 { 159 {
159 return ((*this) - point).diagonalLengthSquared(); 160 return ((*this) - point).diagonalLengthSquared();
160 } 161 }
161 162
162 } // namespace WebCore 163 } // namespace WebCore
163 164
164 #endif // IntPoint_h 165 #endif // IntPoint_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/platform/graphics/IntSize.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698