| 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 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/platform/graphics/FloatPoint.h" | 28 #include "core/platform/graphics/FloatPoint.h" |
| 29 | 29 |
| 30 #include <math.h> | |
| 31 #include <limits> | |
| 32 #include "core/platform/FloatConversion.h" | 30 #include "core/platform/FloatConversion.h" |
| 33 #include "core/platform/graphics/IntPoint.h" | 31 #include "core/platform/graphics/IntPoint.h" |
| 34 #include "core/platform/graphics/LayoutPoint.h" | 32 #include "core/platform/graphics/LayoutPoint.h" |
| 35 #include "core/platform/graphics/LayoutSize.h" | 33 #include "core/platform/graphics/LayoutSize.h" |
| 36 #include "core/platform/graphics/skia/SkiaUtils.h" | 34 #include "core/platform/graphics/skia/SkiaUtils.h" |
| 37 #include "core/platform/graphics/transforms/AffineTransform.h" | 35 #include "core/platform/graphics/transforms/AffineTransform.h" |
| 38 #include "core/platform/graphics/transforms/TransformationMatrix.h" | 36 #include "core/platform/graphics/transforms/TransformationMatrix.h" |
| 39 #include "third_party/skia/include/core/SkPoint.h" | 37 #include "third_party/skia/include/core/SkPoint.h" |
| 38 #include "wtf/MathExtras.h" |
| 39 |
| 40 #include <limits> |
| 41 #include <math.h> |
| 40 | 42 |
| 41 namespace WebCore { | 43 namespace WebCore { |
| 42 | 44 |
| 43 FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y()) | 45 FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y()) |
| 44 { | 46 { |
| 45 } | 47 } |
| 46 | 48 |
| 47 FloatPoint::FloatPoint(const LayoutPoint& p) : m_x(p.x()), m_y(p.y()) | 49 FloatPoint::FloatPoint(const LayoutPoint& p) : m_x(p.x()), m_y(p.y()) |
| 48 { | 50 { |
| 49 } | 51 } |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 double newX, newY; | 100 double newX, newY; |
| 99 transform.map(static_cast<double>(m_x), static_cast<double>(m_y), newX, newY
); | 101 transform.map(static_cast<double>(m_x), static_cast<double>(m_y), newX, newY
); |
| 100 return narrowPrecision(newX, newY); | 102 return narrowPrecision(newX, newY); |
| 101 } | 103 } |
| 102 | 104 |
| 103 FloatPoint FloatPoint::narrowPrecision(double x, double y) | 105 FloatPoint FloatPoint::narrowPrecision(double x, double y) |
| 104 { | 106 { |
| 105 return FloatPoint(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y)); | 107 return FloatPoint(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y)); |
| 106 } | 108 } |
| 107 | 109 |
| 110 inline IntPoint roundedIntPoint(const FloatPoint& p) |
| 111 { |
| 112 return IntPoint(clampToInteger(roundf(p.x())), clampToInteger(roundf(p.y()))
); |
| 113 } |
| 114 |
| 108 float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c) | 115 float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c) |
| 109 { | 116 { |
| 110 if (p2.x() == p1.x()) | 117 if (p2.x() == p1.x()) |
| 111 return std::numeric_limits<float>::infinity(); | 118 return std::numeric_limits<float>::infinity(); |
| 112 | 119 |
| 113 // y = mx + c | 120 // y = mx + c |
| 114 float slope = (p2.y() - p1.y()) / (p2.x() - p1.x()); | 121 float slope = (p2.y() - p1.y()) / (p2.x() - p1.x()); |
| 115 c = p1.y() - slope * p1.x(); | 122 c = p1.y() - slope * p1.x(); |
| 116 return slope; | 123 return slope; |
| 117 } | 124 } |
| (...skipping 20 matching lines...) Expand all Loading... |
| 138 return true; | 145 return true; |
| 139 } | 146 } |
| 140 | 147 |
| 141 // Find x at intersection, where ys overlap; x = (c' - c) / (m - m') | 148 // Find x at intersection, where ys overlap; x = (c' - c) / (m - m') |
| 142 intersection.setX((dOffset - pOffset) / (pSlope - dSlope)); | 149 intersection.setX((dOffset - pOffset) / (pSlope - dSlope)); |
| 143 intersection.setY(pSlope * intersection.x() + pOffset); | 150 intersection.setY(pSlope * intersection.x() + pOffset); |
| 144 return true; | 151 return true; |
| 145 } | 152 } |
| 146 | 153 |
| 147 } | 154 } |
| OLD | NEW |