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

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

Issue 16914003: Fix SVG animations which set rx or ry attributes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update tests with minor nits Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 University of Szeged 2 * Copyright (C) 2011 University of Szeged
3 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org> 3 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 void RenderSVGRect::updateShapeFromElement() 46 void RenderSVGRect::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_innerStrokeRect = FloatRect(); 51 m_innerStrokeRect = FloatRect();
52 m_outerStrokeRect = FloatRect(); 52 m_outerStrokeRect = FloatRect();
53 SVGRectElement* rect = static_cast<SVGRectElement*>(node()); 53 SVGRectElement* rect = static_cast<SVGRectElement*>(node());
54 ASSERT(rect); 54 ASSERT(rect);
55 55
56 SVGLengthContext lengthContext(rect);
56 // Fallback to RenderSVGShape if rect has rounded corners or a non-scaling s troke. 57 // Fallback to RenderSVGShape if rect has rounded corners or a non-scaling s troke.
57 if (rect->hasAttribute(SVGNames::rxAttr) || rect->hasAttribute(SVGNames::ryA ttr) || hasNonScalingStroke()) { 58 if (rect->rx().value(lengthContext) > 0 || rect->ry().value(lengthContext) > 0 || hasNonScalingStroke()) {
58 RenderSVGShape::updateShapeFromElement(); 59 RenderSVGShape::updateShapeFromElement();
59 m_usePathFallback = true; 60 m_usePathFallback = true;
60 return; 61 return;
61 } else 62 }
62 m_usePathFallback = false;
63 63
64 SVGLengthContext lengthContext(rect); 64 m_usePathFallback = false;
65 FloatSize boundingBoxSize(rect->width().value(lengthContext), rect->height() .value(lengthContext)); 65 FloatSize boundingBoxSize(rect->width().value(lengthContext), rect->height() .value(lengthContext));
66 if (boundingBoxSize.isEmpty()) 66 if (boundingBoxSize.isEmpty())
67 return; 67 return;
68 68
69 m_fillBoundingBox = FloatRect(FloatPoint(rect->x().value(lengthContext), rec t->y().value(lengthContext)), boundingBoxSize); 69 m_fillBoundingBox = FloatRect(FloatPoint(rect->x().value(lengthContext), rec t->y().value(lengthContext)), boundingBoxSize);
70 70
71 // To decide if the stroke contains a point we create two rects which repres ent the inner and 71 // To decide if the stroke contains a point we create two rects which repres ent the inner and
72 // the outer stroke borders. A stroke contains the point, if the point is be tween them. 72 // the outer stroke borders. A stroke contains the point, if the point is be tween them.
73 m_innerStrokeRect = m_fillBoundingBox; 73 m_innerStrokeRect = m_fillBoundingBox;
74 m_outerStrokeRect = m_fillBoundingBox; 74 m_outerStrokeRect = m_fillBoundingBox;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 } 119 }
120 120
121 bool RenderSVGRect::shapeDependentFillContains(const FloatPoint& point, const Wi ndRule fillRule) const 121 bool RenderSVGRect::shapeDependentFillContains(const FloatPoint& point, const Wi ndRule fillRule) const
122 { 122 {
123 if (m_usePathFallback) 123 if (m_usePathFallback)
124 return RenderSVGShape::shapeDependentFillContains(point, fillRule); 124 return RenderSVGShape::shapeDependentFillContains(point, fillRule);
125 return m_fillBoundingBox.contains(point.x(), point.y()); 125 return m_fillBoundingBox.contains(point.x(), point.y());
126 } 126 }
127 127
128 } 128 }
OLDNEW
« no previous file with comments | « LayoutTests/svg/stroke/animated-non-scaling-rxry-expected.html ('k') | Source/core/rendering/svg/SVGPathData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698