| Index: Source/core/rendering/svg/SVGPathData.cpp
|
| diff --git a/Source/core/rendering/svg/SVGPathData.cpp b/Source/core/rendering/svg/SVGPathData.cpp
|
| index 0879b8b831ece367f6f7cfeb2fe3fe680a0d25bb..bd8827093d1af4df493ef1119c1641013e69130f 100644
|
| --- a/Source/core/rendering/svg/SVGPathData.cpp
|
| +++ b/Source/core/rendering/svg/SVGPathData.cpp
|
| @@ -40,9 +40,9 @@ static void updatePathFromCircleElement(SVGElement* element, Path& path)
|
| SVGCircleElement* circle = static_cast<SVGCircleElement*>(element);
|
|
|
| SVGLengthContext lengthContext(element);
|
| - float r = circle->r().value(lengthContext);
|
| + float r = circle->rCurrentValue().value(lengthContext);
|
| if (r > 0)
|
| - path.addEllipse(FloatRect(circle->cx().value(lengthContext) - r, circle->cy().value(lengthContext) - r, r * 2, r * 2));
|
| + path.addEllipse(FloatRect(circle->cxCurrentValue().value(lengthContext) - r, circle->cyCurrentValue().value(lengthContext) - r, r * 2, r * 2));
|
| }
|
|
|
| static void updatePathFromEllipseElement(SVGElement* element, Path& path)
|
| @@ -51,13 +51,13 @@ static void updatePathFromEllipseElement(SVGElement* element, Path& path)
|
| SVGEllipseElement* ellipse = static_cast<SVGEllipseElement*>(element);
|
|
|
| SVGLengthContext lengthContext(element);
|
| - float rx = ellipse->rx().value(lengthContext);
|
| + float rx = ellipse->rxCurrentValue().value(lengthContext);
|
| if (rx <= 0)
|
| return;
|
| - float ry = ellipse->ry().value(lengthContext);
|
| + float ry = ellipse->ryCurrentValue().value(lengthContext);
|
| if (ry <= 0)
|
| return;
|
| - path.addEllipse(FloatRect(ellipse->cx().value(lengthContext) - rx, ellipse->cy().value(lengthContext) - ry, rx * 2, ry * 2));
|
| + path.addEllipse(FloatRect(ellipse->cxCurrentValue().value(lengthContext) - rx, ellipse->cyCurrentValue().value(lengthContext) - ry, rx * 2, ry * 2));
|
| }
|
|
|
| static void updatePathFromLineElement(SVGElement* element, Path& path)
|
| @@ -66,8 +66,8 @@ static void updatePathFromLineElement(SVGElement* element, Path& path)
|
| SVGLineElement* line = static_cast<SVGLineElement*>(element);
|
|
|
| SVGLengthContext lengthContext(element);
|
| - path.moveTo(FloatPoint(line->x1().value(lengthContext), line->y1().value(lengthContext)));
|
| - path.addLineTo(FloatPoint(line->x2().value(lengthContext), line->y2().value(lengthContext)));
|
| + path.moveTo(FloatPoint(line->x1CurrentValue().value(lengthContext), line->y1CurrentValue().value(lengthContext)));
|
| + path.addLineTo(FloatPoint(line->x2CurrentValue().value(lengthContext), line->y2CurrentValue().value(lengthContext)));
|
| }
|
|
|
| static void updatePathFromPathElement(SVGElement* element, Path& path)
|
| @@ -116,19 +116,19 @@ static void updatePathFromRectElement(SVGElement* element, Path& path)
|
| SVGRectElement* rect = static_cast<SVGRectElement*>(element);
|
|
|
| SVGLengthContext lengthContext(element);
|
| - float width = rect->width().value(lengthContext);
|
| + float width = rect->widthCurrentValue().value(lengthContext);
|
| if (width <= 0)
|
| return;
|
| - float height = rect->height().value(lengthContext);
|
| + float height = rect->heightCurrentValue().value(lengthContext);
|
| if (height <= 0)
|
| return;
|
| - float x = rect->x().value(lengthContext);
|
| - float y = rect->y().value(lengthContext);
|
| - bool hasRx = rect->rx().value(lengthContext) > 0;
|
| - bool hasRy = rect->ry().value(lengthContext) > 0;
|
| + float x = rect->xCurrentValue().value(lengthContext);
|
| + float y = rect->yCurrentValue().value(lengthContext);
|
| + bool hasRx = rect->rxCurrentValue().value(lengthContext) > 0;
|
| + bool hasRy = rect->ryCurrentValue().value(lengthContext) > 0;
|
| if (hasRx || hasRy) {
|
| - float rx = rect->rx().value(lengthContext);
|
| - float ry = rect->ry().value(lengthContext);
|
| + float rx = rect->rxCurrentValue().value(lengthContext);
|
| + float ry = rect->ryCurrentValue().value(lengthContext);
|
| if (!hasRx)
|
| rx = ry;
|
| else if (!hasRy)
|
|
|