Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(861)

Side by Side Diff: Source/core/rendering/svg/RenderSVGEllipse.cpp

Issue 307643003: Don't render empty shapes with non-scaling-stroke (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update TEs. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 void RenderSVGEllipse::updateShapeFromElement() 47 void RenderSVGEllipse::updateShapeFromElement()
48 { 48 {
49 // Before creating a new object we need to clear the cached bounding box 49 // Before creating a new object we need to clear the cached bounding box
50 // to avoid using garbage. 50 // to avoid using garbage.
51 m_fillBoundingBox = FloatRect(); 51 m_fillBoundingBox = FloatRect();
52 m_strokeBoundingBox = FloatRect(); 52 m_strokeBoundingBox = FloatRect();
53 m_center = FloatPoint(); 53 m_center = FloatPoint();
54 m_radii = FloatSize(); 54 m_radii = FloatSize();
55 55
56 // Fallback to RenderSVGShape if shape has a non-scaling stroke.
57 if (hasNonScalingStroke()) {
58 RenderSVGShape::updateShapeFromElement();
59 m_usePathFallback = true;
60 return;
61 } else
62 m_usePathFallback = false;
63
64 calculateRadiiAndCenter(); 56 calculateRadiiAndCenter();
65 57
66 // Spec: "A negative value is an error. A value of zero disables rendering o f the element." 58 // Spec: "A negative value is an error. A value of zero disables rendering o f the element."
67 if (m_radii.isZero() || m_radii.width() < 0 || m_radii.height() < 0) 59 if (m_radii.width() < 0 || m_radii.height() < 0)
68 return; 60 return;
69 61
62 if (!m_radii.isEmpty()) {
63 // Fallback to RenderSVGShape if shape has a non-scaling stroke.
64 if (hasNonScalingStroke()) {
65 RenderSVGShape::updateShapeFromElement();
66 m_usePathFallback = true;
67 return;
68 }
69 m_usePathFallback = false;
70 }
71
70 m_fillBoundingBox = FloatRect(m_center.x() - m_radii.width(), m_center.y() - m_radii.height(), 2 * m_radii.width(), 2 * m_radii.height()); 72 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; 73 m_strokeBoundingBox = m_fillBoundingBox;
72 if (style()->svgStyle()->hasStroke()) 74 if (style()->svgStyle()->hasStroke())
73 m_strokeBoundingBox.inflate(strokeWidth() / 2); 75 m_strokeBoundingBox.inflate(strokeWidth() / 2);
74 } 76 }
75 77
76 void RenderSVGEllipse::calculateRadiiAndCenter() 78 void RenderSVGEllipse::calculateRadiiAndCenter()
77 { 79 {
78 ASSERT(element()); 80 ASSERT(element());
79 if (isSVGCircleElement(*element())) { 81 if (isSVGCircleElement(*element())) {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 FloatPoint center = FloatPoint(m_center.x() - point.x(), m_center.y() - poin t.y()); 148 FloatPoint center = FloatPoint(m_center.x() - point.x(), m_center.y() - poin t.y());
147 149
148 // This works by checking if the point satisfies the ellipse equation. 150 // This works by checking if the point satisfies the ellipse equation.
149 // (x/rX)^2 + (y/rY)^2 <= 1 151 // (x/rX)^2 + (y/rY)^2 <= 1
150 float xrX = center.x() / m_radii.width(); 152 float xrX = center.x() / m_radii.width();
151 float yrY = center.y() / m_radii.height(); 153 float yrY = center.y() / m_radii.height();
152 return xrX * xrX + yrY * yrY <= 1.0; 154 return xrX * xrX + yrY * yrY <= 1.0;
153 } 155 }
154 156
155 } 157 }
OLDNEW
« no previous file with comments | « LayoutTests/svg/custom/non-scaling-stroke-on-empty-shapes-expected.html ('k') | Source/core/rendering/svg/RenderSVGRect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698