Index: Source/core/rendering/svg/SVGRenderTreeAsText.cpp |
diff --git a/Source/core/rendering/svg/SVGRenderTreeAsText.cpp b/Source/core/rendering/svg/SVGRenderTreeAsText.cpp |
index 952b085f858db8057aff46dfbcaba745d5418492..980fa195a64778abddcfb96e58439c0fe0d551bd 100644 |
--- a/Source/core/rendering/svg/SVGRenderTreeAsText.cpp |
+++ b/Source/core/rendering/svg/SVGRenderTreeAsText.cpp |
@@ -332,27 +332,27 @@ static TextStream& operator<<(TextStream& ts, const RenderSVGShape& shape) |
if (svgElement->hasTagName(SVGNames::rectTag)) { |
SVGRectElement* element = static_cast<SVGRectElement*>(svgElement); |
- writeNameValuePair(ts, "x", element->x().value(lengthContext)); |
- writeNameValuePair(ts, "y", element->y().value(lengthContext)); |
- writeNameValuePair(ts, "width", element->width().value(lengthContext)); |
- writeNameValuePair(ts, "height", element->height().value(lengthContext)); |
+ writeNameValuePair(ts, "x", element->xCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "y", element->yCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "width", element->widthCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "height", element->heightCurrentValue().value(lengthContext)); |
} else if (svgElement->hasTagName(SVGNames::lineTag)) { |
SVGLineElement* element = static_cast<SVGLineElement*>(svgElement); |
- writeNameValuePair(ts, "x1", element->x1().value(lengthContext)); |
- writeNameValuePair(ts, "y1", element->y1().value(lengthContext)); |
- writeNameValuePair(ts, "x2", element->x2().value(lengthContext)); |
- writeNameValuePair(ts, "y2", element->y2().value(lengthContext)); |
+ writeNameValuePair(ts, "x1", element->x1CurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "y1", element->y1CurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "x2", element->x2CurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "y2", element->y2CurrentValue().value(lengthContext)); |
} else if (svgElement->hasTagName(SVGNames::ellipseTag)) { |
SVGEllipseElement* element = static_cast<SVGEllipseElement*>(svgElement); |
- writeNameValuePair(ts, "cx", element->cx().value(lengthContext)); |
- writeNameValuePair(ts, "cy", element->cy().value(lengthContext)); |
- writeNameValuePair(ts, "rx", element->rx().value(lengthContext)); |
- writeNameValuePair(ts, "ry", element->ry().value(lengthContext)); |
+ writeNameValuePair(ts, "cx", element->cxCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "cy", element->cyCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "rx", element->rxCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "ry", element->ryCurrentValue().value(lengthContext)); |
} else if (svgElement->hasTagName(SVGNames::circleTag)) { |
SVGCircleElement* element = static_cast<SVGCircleElement*>(svgElement); |
- writeNameValuePair(ts, "cx", element->cx().value(lengthContext)); |
- writeNameValuePair(ts, "cy", element->cy().value(lengthContext)); |
- writeNameValuePair(ts, "r", element->r().value(lengthContext)); |
+ writeNameValuePair(ts, "cx", element->cxCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "cy", element->cyCurrentValue().value(lengthContext)); |
+ writeNameValuePair(ts, "r", element->rCurrentValue().value(lengthContext)); |
} else if (svgElement->hasTagName(SVGNames::polygonTag) || svgElement->hasTagName(SVGNames::polylineTag)) { |
SVGPolyElement* element = static_cast<SVGPolyElement*>(svgElement); |
writeNameAndQuotedValue(ts, "points", element->pointList().valueAsString()); |
@@ -632,7 +632,7 @@ void writeSVGGradientStop(TextStream& ts, const RenderSVGGradientStop& stop, int |
if (!style) |
return; |
- ts << " [offset=" << stopElement->offset() << "] [color=" << stopElement->stopColorIncludingOpacity() << "]\n"; |
+ ts << " [offset=" << stopElement->offsetCurrentValue() << "] [color=" << stopElement->stopColorIncludingOpacity() << "]\n"; |
} |
void writeResources(TextStream& ts, const RenderObject& object, int indent) |