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

Side by Side Diff: platform/graphics/FloatRect.h

Issue 174242: Bring the Mac Chromium render theme up to date and easier to keep merged. DO ... (Closed) Base URL: http://svn.webkit.org/repository/webkit/trunk/WebCore/
Patch Set: '' Created 11 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 | « platform/graphics/FloatPoint.h ('k') | platform/graphics/FloatSize.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, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2005 Nokia. All rights reserved. 3 * Copyright (C) 2005 Nokia. 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 15 matching lines...) Expand all
26 26
27 #ifndef FloatRect_h 27 #ifndef FloatRect_h
28 #define FloatRect_h 28 #define FloatRect_h
29 29
30 #include "FloatPoint.h" 30 #include "FloatPoint.h"
31 31
32 #if PLATFORM(CG) 32 #if PLATFORM(CG)
33 typedef struct CGRect CGRect; 33 typedef struct CGRect CGRect;
34 #endif 34 #endif
35 35
36 #if PLATFORM(MAC) 36 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN))
37 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 37 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
38 typedef struct CGRect NSRect; 38 typedef struct CGRect NSRect;
39 #else 39 #else
40 typedef struct _NSRect NSRect; 40 typedef struct _NSRect NSRect;
41 #endif 41 #endif
42 #endif 42 #endif
43 43
44 #if PLATFORM(QT) 44 #if PLATFORM(QT)
45 QT_BEGIN_NAMESPACE 45 QT_BEGIN_NAMESPACE
46 class QRectF; 46 class QRectF;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 m_size.setHeight(m_size.height() + dy + dy); 120 m_size.setHeight(m_size.height() + dy + dy);
121 } 121 }
122 void inflate(float d) { inflateX(d); inflateY(d); } 122 void inflate(float d) { inflateX(d); inflateY(d); }
123 void scale(float s); 123 void scale(float s);
124 124
125 #if PLATFORM(CG) 125 #if PLATFORM(CG)
126 FloatRect(const CGRect&); 126 FloatRect(const CGRect&);
127 operator CGRect() const; 127 operator CGRect() const;
128 #endif 128 #endif
129 129
130 #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) 130 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
131 || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN))
131 FloatRect(const NSRect&); 132 FloatRect(const NSRect&);
132 operator NSRect() const; 133 operator NSRect() const;
133 #endif 134 #endif
134 135
135 #if PLATFORM(QT) 136 #if PLATFORM(QT)
136 FloatRect(const QRectF&); 137 FloatRect(const QRectF&);
137 operator QRectF() const; 138 operator QRectF() const;
138 #endif 139 #endif
139 140
140 #if PLATFORM(WX) && USE(WXGC) 141 #if PLATFORM(WX) && USE(WXGC)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 } 184 }
184 185
185 IntRect enclosingIntRect(const FloatRect&); 186 IntRect enclosingIntRect(const FloatRect&);
186 187
187 // Map rect r from srcRect to an equivalent rect in destRect. 188 // Map rect r from srcRect to an equivalent rect in destRect.
188 FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect& destRect); 189 FloatRect mapRect(const FloatRect& r, const FloatRect& srcRect, const FloatRect& destRect);
189 190
190 } 191 }
191 192
192 #endif 193 #endif
OLDNEW
« no previous file with comments | « platform/graphics/FloatPoint.h ('k') | platform/graphics/FloatSize.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698