Index: Source/core/rendering/svg/SVGPathData.cpp |
diff --git a/Source/core/rendering/svg/SVGPathData.cpp b/Source/core/rendering/svg/SVGPathData.cpp |
index bd94518746f05f83035834196656c19e5e9a72ea..3bf752d443423655081aa2133b79d488d38ae5c1 100644 |
--- a/Source/core/rendering/svg/SVGPathData.cpp |
+++ b/Source/core/rendering/svg/SVGPathData.cpp |
@@ -19,6 +19,8 @@ |
#include "config.h" |
#include "core/rendering/svg/SVGPathData.h" |
+#include "core/rendering/RenderObject.h" |
+#include "core/rendering/style/SVGRenderStyle.h" |
#include "core/SVGNames.h" |
#include "core/svg/SVGCircleElement.h" |
@@ -102,6 +104,9 @@ static void updatePathFromPolygonElement(SVGElement* element, Path& path) |
static void updatePathFromRectElement(SVGElement* element, Path& path) |
{ |
SVGRectElement* rect = toSVGRectElement(element); |
+ RenderObject* renderer = rect->renderer(); |
+ if (!renderer) |
+ return; |
SVGLengthContext lengthContext(element); |
float width = rect->width()->currentValue()->value(lengthContext); |
@@ -112,8 +117,10 @@ static void updatePathFromRectElement(SVGElement* element, Path& path) |
return; |
if (!width && !height) |
return; |
- float x = rect->x()->currentValue()->value(lengthContext); |
- float y = rect->y()->currentValue()->value(lengthContext); |
+ |
+ const SVGRenderStyle& style = renderer->style()->svgStyle(); |
+ float x = lengthContext.valueForLength(style.x(), LengthModeWidth); |
+ float y = lengthContext.valueForLength(style.y(), LengthModeHeight); |
float rx = rect->rx()->currentValue()->value(lengthContext); |
float ry = rect->ry()->currentValue()->value(lengthContext); |
bool hasRx = rx > 0; |