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 |
(...skipping 28 matching lines...) Expand all Loading... |
39 // Skia has problems when passed infinite, etc floats, filter them to 0. | 39 // Skia has problems when passed infinite, etc floats, filter them to 0. |
40 static inline SkScalar WebCoreFloatToSkScalar(float f) | 40 static inline SkScalar WebCoreFloatToSkScalar(float f) |
41 { | 41 { |
42 return SkFloatToScalar(std::isfinite(f) ? f : 0); | 42 return SkFloatToScalar(std::isfinite(f) ? f : 0); |
43 } | 43 } |
44 | 44 |
45 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()) |
46 { | 46 { |
47 } | 47 } |
48 | 48 |
49 FloatPoint::FloatPoint(const LayoutPoint& p) : m_x(p.x()), m_y(p.y()) | 49 FloatPoint::FloatPoint(const LayoutPoint& p) |
| 50 : m_x(p.x().toFloat()) |
| 51 , m_y(p.y().toFloat()) |
50 { | 52 { |
51 } | 53 } |
52 | 54 |
53 void FloatPoint::normalize() | 55 void FloatPoint::normalize() |
54 { | 56 { |
55 float tempLength = length(); | 57 float tempLength = length(); |
56 | 58 |
57 if (tempLength) { | 59 if (tempLength) { |
58 m_x /= tempLength; | 60 m_x /= tempLength; |
59 m_y /= tempLength; | 61 m_y /= tempLength; |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 return false; | 119 return false; |
118 | 120 |
119 float param = ((d1.x() - p1.x()) * dyLength - (d1.y() - p1.y()) * dxLength)
/ denom; | 121 float param = ((d1.x() - p1.x()) * dyLength - (d1.y() - p1.y()) * dxLength)
/ denom; |
120 | 122 |
121 intersection.setX(p1.x() + param * pxLength); | 123 intersection.setX(p1.x() + param * pxLength); |
122 intersection.setY(p1.y() + param * pyLength); | 124 intersection.setY(p1.y() + param * pyLength); |
123 return true; | 125 return true; |
124 } | 126 } |
125 | 127 |
126 } | 128 } |
OLD | NEW |