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

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

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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
« no previous file with comments | « Source/core/platform/graphics/IntRect.h ('k') | Source/core/platform/graphics/SimpleFontData.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) 2003, 2004, 2005, 2006 Apple Computer, Inc. All rights reserve d. 2 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. All rights reserve d.
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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
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 IntSize_h 27 #ifndef IntSize_h
28 #define IntSize_h 28 #define IntSize_h
29 29
30 #if OS(DARWIN) 30 #if OS(MACOSX)
31 typedef struct CGSize CGSize; 31 typedef struct CGSize CGSize;
32 32
33 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 33 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
34 typedef struct CGSize NSSize; 34 typedef struct CGSize NSSize;
35 #else 35 #else
36 typedef struct _NSSize NSSize; 36 typedef struct _NSSize NSSize;
37 #endif 37 #endif
38 #endif 38 #endif
39 39
40 namespace WebCore { 40 namespace WebCore {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 int diagonalLengthSquared() const 105 int diagonalLengthSquared() const
106 { 106 {
107 return m_width * m_width + m_height * m_height; 107 return m_width * m_width + m_height * m_height;
108 } 108 }
109 109
110 IntSize transposedSize() const 110 IntSize transposedSize() const
111 { 111 {
112 return IntSize(m_height, m_width); 112 return IntSize(m_height, m_width);
113 } 113 }
114 114
115 #if OS(DARWIN) 115 #if OS(MACOSX)
116 explicit IntSize(const CGSize&); // don't do this implicitly since it's loss y 116 explicit IntSize(const CGSize&); // don't do this implicitly since it's loss y
117 operator CGSize() const; 117 operator CGSize() const;
118 118
119 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) 119 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
120 explicit IntSize(const NSSize &); // don't do this implicitly since it's los sy 120 explicit IntSize(const NSSize &); // don't do this implicitly since it's los sy
121 operator NSSize() const; 121 operator NSSize() const;
122 #endif 122 #endif
123 #endif 123 #endif
124 124
125 private: 125 private:
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 161 }
162 162
163 inline bool operator!=(const IntSize& a, const IntSize& b) 163 inline bool operator!=(const IntSize& a, const IntSize& b)
164 { 164 {
165 return a.width() != b.width() || a.height() != b.height(); 165 return a.width() != b.width() || a.height() != b.height();
166 } 166 }
167 167
168 } // namespace WebCore 168 } // namespace WebCore
169 169
170 #endif // IntSize_h 170 #endif // IntSize_h
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/IntRect.h ('k') | Source/core/platform/graphics/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698