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

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

Issue 810343003: Fix pointer-events:all when stroke="none" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove line uniting m_hitTestStrokeBoundingBox with markerRect Created 5 years, 11 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
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 RenderSVGEllipse::~RenderSVGEllipse() 42 RenderSVGEllipse::~RenderSVGEllipse()
43 { 43 {
44 } 44 }
45 45
46 void RenderSVGEllipse::updateShapeFromElement() 46 void RenderSVGEllipse::updateShapeFromElement()
47 { 47 {
48 // Before creating a new object we need to clear the cached bounding box 48 // Before creating a new object we need to clear the cached bounding box
49 // to avoid using garbage. 49 // to avoid using garbage.
50 m_fillBoundingBox = FloatRect(); 50 m_fillBoundingBox = FloatRect();
51 m_strokeBoundingBox = FloatRect(); 51 m_strokeBoundingBox = FloatRect();
52 m_hitTestStrokeBoundingBox = FloatRect();
52 m_center = FloatPoint(); 53 m_center = FloatPoint();
53 m_radii = FloatSize(); 54 m_radii = FloatSize();
54 m_usePathFallback = false; 55 m_usePathFallback = false;
55 56
56 calculateRadiiAndCenter(); 57 calculateRadiiAndCenter();
57 58
58 // Spec: "A negative value is an error. A value of zero disables rendering o f the element." 59 // Spec: "A negative value is an error. A value of zero disables rendering o f the element."
59 if (m_radii.width() < 0 || m_radii.height() < 0) 60 if (m_radii.width() < 0 || m_radii.height() < 0)
60 return; 61 return;
61 62
62 if (!m_radii.isEmpty()) { 63 if (!m_radii.isEmpty()) {
63 // Fallback to RenderSVGShape and path-based hit detection if the ellips e 64 // Fallback to RenderSVGShape and path-based hit detection if the ellips e
64 // has a non-scaling or discontinuous stroke. 65 // has a non-scaling or discontinuous stroke.
65 if (hasNonScalingStroke() || !hasContinuousStroke()) { 66 if (hasNonScalingStroke() || !hasContinuousStroke()) {
66 RenderSVGShape::updateShapeFromElement(); 67 RenderSVGShape::updateShapeFromElement();
67 m_usePathFallback = true; 68 m_usePathFallback = true;
68 return; 69 return;
69 } 70 }
70 } 71 }
71 72
72 m_fillBoundingBox = FloatRect(m_center.x() - m_radii.width(), m_center.y() - m_radii.height(), 2 * m_radii.width(), 2 * m_radii.height()); 73 m_fillBoundingBox = FloatRect(m_center.x() - m_radii.width(), m_center.y() - m_radii.height(), 2 * m_radii.width(), 2 * m_radii.height());
73 m_strokeBoundingBox = m_fillBoundingBox; 74 m_hitTestStrokeBoundingBox = m_fillBoundingBox;
74 if (style()->svgStyle().hasStroke()) 75 m_hitTestStrokeBoundingBox.inflate(strokeWidth() / 2);
75 m_strokeBoundingBox.inflate(strokeWidth() / 2); 76 m_strokeBoundingBox = style()->svgStyle().hasStroke() ? m_hitTestStrokeBound ingBox : m_fillBoundingBox;
76 } 77 }
77 78
78 void RenderSVGEllipse::calculateRadiiAndCenter() 79 void RenderSVGEllipse::calculateRadiiAndCenter()
79 { 80 {
80 ASSERT(element()); 81 ASSERT(element());
81 if (isSVGCircleElement(*element())) { 82 if (isSVGCircleElement(*element())) {
82 SVGCircleElement& circle = toSVGCircleElement(*element()); 83 SVGCircleElement& circle = toSVGCircleElement(*element());
83 84
84 SVGLengthContext lengthContext(&circle); 85 SVGLengthContext lengthContext(&circle);
85 float radius = circle.r()->currentValue()->value(lengthContext); 86 float radius = circle.r()->currentValue()->value(lengthContext);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 return xrX * xrX + yrY * yrY <= 1.0; 135 return xrX * xrX + yrY * yrY <= 1.0;
135 } 136 }
136 137
137 bool RenderSVGEllipse::hasContinuousStroke() const 138 bool RenderSVGEllipse::hasContinuousStroke() const
138 { 139 {
139 const SVGRenderStyle& svgStyle = style()->svgStyle(); 140 const SVGRenderStyle& svgStyle = style()->svgStyle();
140 return svgStyle.strokeDashArray()->isEmpty(); 141 return svgStyle.strokeDashArray()->isEmpty();
141 } 142 }
142 143
143 } 144 }
OLDNEW
« no previous file with comments | « LayoutTests/svg/hittest/rect-hittest-expected.txt ('k') | Source/core/rendering/svg/RenderSVGPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698