OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google, Inc. | 2 * Copyright (C) 2012 Google, Inc. |
3 * All rights reserved. | 3 * 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 // Fallback to RenderSVGShape if shape has a non-scaling stroke. | 56 // Fallback to RenderSVGShape if shape has a non-scaling stroke. |
57 if (hasNonScalingStroke()) { | 57 if (hasNonScalingStroke()) { |
58 RenderSVGShape::updateShapeFromElement(); | 58 RenderSVGShape::updateShapeFromElement(); |
59 m_usePathFallback = true; | 59 m_usePathFallback = true; |
60 return; | 60 return; |
61 } else | 61 } else |
62 m_usePathFallback = false; | 62 m_usePathFallback = false; |
63 | 63 |
64 calculateRadiiAndCenter(); | 64 calculateRadiiAndCenter(); |
65 | 65 |
66 // Spec: "A value of zero disables rendering of the element." | 66 // Spec: "A negative value is an error. A value of zero disables rendering o
f the element." |
67 if (m_radii.width() <= 0 || m_radii.height() <= 0) | 67 if (m_radii.isZero() || m_radii.width() < 0 || m_radii.height() < 0) |
68 return; | 68 return; |
69 | 69 |
70 m_fillBoundingBox = FloatRect(m_center.x() - m_radii.width(), m_center.y() -
m_radii.height(), 2 * m_radii.width(), 2 * m_radii.height()); | 70 m_fillBoundingBox = FloatRect(m_center.x() - m_radii.width(), m_center.y() -
m_radii.height(), 2 * m_radii.width(), 2 * m_radii.height()); |
71 m_strokeBoundingBox = m_fillBoundingBox; | 71 m_strokeBoundingBox = m_fillBoundingBox; |
72 if (style()->svgStyle()->hasStroke()) | 72 if (style()->svgStyle()->hasStroke()) |
73 m_strokeBoundingBox.inflate(strokeWidth() / 2); | 73 m_strokeBoundingBox.inflate(strokeWidth() / 2); |
74 } | 74 } |
75 | 75 |
76 void RenderSVGEllipse::calculateRadiiAndCenter() | 76 void RenderSVGEllipse::calculateRadiiAndCenter() |
77 { | 77 { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 FloatPoint center = FloatPoint(m_center.x() - point.x(), m_center.y() - poin
t.y()); | 146 FloatPoint center = FloatPoint(m_center.x() - point.x(), m_center.y() - poin
t.y()); |
147 | 147 |
148 // This works by checking if the point satisfies the ellipse equation. | 148 // This works by checking if the point satisfies the ellipse equation. |
149 // (x/rX)^2 + (y/rY)^2 <= 1 | 149 // (x/rX)^2 + (y/rY)^2 <= 1 |
150 float xrX = center.x() / m_radii.width(); | 150 float xrX = center.x() / m_radii.width(); |
151 float yrY = center.y() / m_radii.height(); | 151 float yrY = center.y() / m_radii.height(); |
152 return xrX * xrX + yrY * yrY <= 1.0; | 152 return xrX * xrX + yrY * yrY <= 1.0; |
153 } | 153 } |
154 | 154 |
155 } | 155 } |
OLD | NEW |