Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 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 |
| 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 FloatPoint_h | 27 #ifndef FloatPoint_h |
| 28 #define FloatPoint_h | 28 #define FloatPoint_h |
| 29 | 29 |
| 30 #include "core/platform/graphics/FloatSize.h" | 30 #include "platform/geometry/FloatSize.h" |
| 31 #include "core/platform/graphics/IntPoint.h" | 31 #include "platform/geometry/IntPoint.h" |
| 32 #include "wtf/MathExtras.h" | 32 #include "wtf/MathExtras.h" |
| 33 #include <algorithm> | 33 #include <algorithm> |
| 34 | 34 |
| 35 #if OS(MACOSX) | 35 #if OS(MACOSX) |
| 36 typedef struct CGPoint CGPoint; | 36 typedef struct CGPoint CGPoint; |
| 37 | 37 |
| 38 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES | 38 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES |
| 39 typedef struct CGPoint NSPoint; | 39 typedef struct CGPoint NSPoint; |
| 40 #else | 40 #else |
| 41 typedef struct _NSPoint NSPoint; | 41 typedef struct _NSPoint NSPoint; |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 FloatPoint(const CGPoint&); | 136 FloatPoint(const CGPoint&); |
| 137 operator CGPoint() const; | 137 operator CGPoint() const; |
| 138 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) | 138 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) |
| 139 FloatPoint(const NSPoint&); | 139 FloatPoint(const NSPoint&); |
| 140 operator NSPoint() const; | 140 operator NSPoint() const; |
| 141 #endif | 141 #endif |
| 142 #endif | 142 #endif |
| 143 | 143 |
| 144 operator SkPoint() const; | 144 operator SkPoint() const; |
| 145 | 145 |
| 146 // FIXME: These are only used by SVGPoint and should probably move there | |
|
pdr.
2013/10/01 23:21:28
Mind filing a bug for this?
| |
| 146 FloatPoint matrixTransform(const TransformationMatrix&) const; | 147 FloatPoint matrixTransform(const TransformationMatrix&) const; |
| 147 FloatPoint matrixTransform(const AffineTransform&) const; | 148 FloatPoint matrixTransform(const AffineTransform&) const; |
| 148 | 149 |
| 149 private: | 150 private: |
| 150 float m_x, m_y; | 151 float m_x, m_y; |
| 151 }; | 152 }; |
| 152 | 153 |
| 153 | 154 |
| 154 inline FloatPoint& operator+=(FloatPoint& a, const FloatSize& b) | 155 inline FloatPoint& operator+=(FloatPoint& a, const FloatSize& b) |
| 155 { | 156 { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 236 } | 237 } |
| 237 | 238 |
| 238 float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c); | 239 float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c); |
| 239 | 240 |
| 240 // Find point where lines through the two pairs of points intersect. Returns fal se if the lines don't intersect. | 241 // Find point where lines through the two pairs of points intersect. Returns fal se if the lines don't intersect. |
| 241 bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoi nt& d1, const FloatPoint& d2, FloatPoint& intersection); | 242 bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoi nt& d1, const FloatPoint& d2, FloatPoint& intersection); |
| 242 | 243 |
| 243 } | 244 } |
| 244 | 245 |
| 245 #endif | 246 #endif |
| OLD | NEW |