| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * Copyright (C) 2005 Nokia. All rights reserved. | 3 * Copyright (C) 2005 Nokia. All rights reserved. |
| 4 * 2008 Eric Seidel <eric@webkit.org> | 4 * 2008 Eric Seidel <eric@webkit.org> |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef FloatSize_h | 28 #ifndef FloatSize_h |
| 29 #define FloatSize_h | 29 #define FloatSize_h |
| 30 | 30 |
| 31 #include "platform/geometry/IntPoint.h" | 31 #include "platform/geometry/IntPoint.h" |
| 32 #include "wtf/MathExtras.h" | 32 #include "wtf/MathExtras.h" |
| 33 | 33 |
| 34 #if OS(MACOSX) | |
| 35 typedef struct CGSize CGSize; | |
| 36 | |
| 37 #ifdef __OBJC__ | |
| 38 #import <Foundation/Foundation.h> | |
| 39 #endif | |
| 40 #endif | |
| 41 | |
| 42 namespace blink { | 34 namespace blink { |
| 43 | 35 |
| 44 class IntSize; | 36 class IntSize; |
| 45 class LayoutSize; | 37 class LayoutSize; |
| 46 | 38 |
| 47 class PLATFORM_EXPORT FloatSize { | 39 class PLATFORM_EXPORT FloatSize { |
| 48 public: | 40 public: |
| 49 FloatSize() : m_width(0), m_height(0) { } | 41 FloatSize() : m_width(0), m_height(0) { } |
| 50 FloatSize(float width, float height) : m_width(width), m_height(height) { } | 42 FloatSize(float width, float height) : m_width(width), m_height(height) { } |
| 51 FloatSize(const IntSize& size) : m_width(size.width()), m_height(size.height
()) { } | 43 FloatSize(const IntSize& size) : m_width(size.width()), m_height(size.height
()) { } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 FloatSize scaledBy(float scale) const | 97 FloatSize scaledBy(float scale) const |
| 106 { | 98 { |
| 107 return scaledBy(scale, scale); | 99 return scaledBy(scale, scale); |
| 108 } | 100 } |
| 109 | 101 |
| 110 FloatSize scaledBy(float scaleX, float scaleY) const | 102 FloatSize scaledBy(float scaleX, float scaleY) const |
| 111 { | 103 { |
| 112 return FloatSize(m_width * scaleX, m_height * scaleY); | 104 return FloatSize(m_width * scaleX, m_height * scaleY); |
| 113 } | 105 } |
| 114 | 106 |
| 115 #if OS(MACOSX) | |
| 116 explicit FloatSize(const CGSize&); // don't do this implicitly since it's lo
ssy | |
| 117 operator CGSize() const; | |
| 118 #if defined(__OBJC__) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | |
| 119 explicit FloatSize(const NSSize &); // don't do this implicitly since it's l
ossy | |
| 120 operator NSSize() const; | |
| 121 #endif | |
| 122 #endif | |
| 123 | |
| 124 private: | 107 private: |
| 125 float m_width, m_height; | 108 float m_width, m_height; |
| 126 }; | 109 }; |
| 127 | 110 |
| 128 inline FloatSize& operator+=(FloatSize& a, const FloatSize& b) | 111 inline FloatSize& operator+=(FloatSize& a, const FloatSize& b) |
| 129 { | 112 { |
| 130 a.setWidth(a.width() + b.width()); | 113 a.setWidth(a.width() + b.width()); |
| 131 a.setHeight(a.height() + b.height()); | 114 a.setHeight(a.height() + b.height()); |
| 132 return a; | 115 return a; |
| 133 } | 116 } |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 } | 173 } |
| 191 | 174 |
| 192 inline IntPoint flooredIntPoint(const FloatSize& p) | 175 inline IntPoint flooredIntPoint(const FloatSize& p) |
| 193 { | 176 { |
| 194 return IntPoint(clampToInteger(floorf(p.width())), clampToInteger(floorf(p.h
eight()))); | 177 return IntPoint(clampToInteger(floorf(p.width())), clampToInteger(floorf(p.h
eight()))); |
| 195 } | 178 } |
| 196 | 179 |
| 197 } // namespace blink | 180 } // namespace blink |
| 198 | 181 |
| 199 #endif // FloatSize_h | 182 #endif // FloatSize_h |
| OLD | NEW |