| Index: Source/core/rendering/svg/RenderSVGResourceMarker.cpp
|
| diff --git a/Source/core/rendering/svg/RenderSVGResourceMarker.cpp b/Source/core/rendering/svg/RenderSVGResourceMarker.cpp
|
| index b5a08be237c78a2cebd35fe50f23804c9427760e..2f5bdb108a8255ad530965df40605fb1b8a1e575 100644
|
| --- a/Source/core/rendering/svg/RenderSVGResourceMarker.cpp
|
| +++ b/Source/core/rendering/svg/RenderSVGResourceMarker.cpp
|
| @@ -98,7 +98,7 @@ FloatPoint RenderSVGResourceMarker::referencePoint() const
|
| ASSERT(marker);
|
|
|
| SVGLengthContext lengthContext(marker);
|
| - return FloatPoint(marker->refX().value(lengthContext), marker->refY().value(lengthContext));
|
| + return FloatPoint(marker->refXCurrentValue().value(lengthContext), marker->refYCurrentValue().value(lengthContext));
|
| }
|
|
|
| float RenderSVGResourceMarker::angle() const
|
| @@ -107,8 +107,8 @@ float RenderSVGResourceMarker::angle() const
|
| ASSERT(marker);
|
|
|
| float angle = -1;
|
| - if (marker->orientType() == SVGMarkerOrientAngle)
|
| - angle = marker->orientAngle().value();
|
| + if (marker->orientTypeCurrentValue() == SVGMarkerOrientAngle)
|
| + angle = marker->orientAngleCurrentValue().value();
|
|
|
| return angle;
|
| }
|
| @@ -119,7 +119,7 @@ AffineTransform RenderSVGResourceMarker::markerTransformation(const FloatPoint&
|
| ASSERT(marker);
|
|
|
| float markerAngle = angle();
|
| - bool useStrokeWidth = marker->markerUnits() == SVGMarkerUnitsStrokeWidth;
|
| + bool useStrokeWidth = marker->markerUnitsCurrentValue() == SVGMarkerUnitsStrokeWidth;
|
|
|
| AffineTransform transform;
|
| transform.translate(origin.x(), origin.y());
|
| @@ -133,7 +133,7 @@ void RenderSVGResourceMarker::draw(PaintInfo& paintInfo, const AffineTransform&
|
| // An empty viewBox disables rendering.
|
| SVGMarkerElement* marker = toSVGMarkerElement(toSVGElement(node()));
|
| ASSERT(marker);
|
| - if (marker->hasAttribute(SVGNames::viewBoxAttr) && marker->viewBoxIsValid() && marker->viewBox().isEmpty())
|
| + if (marker->hasAttribute(SVGNames::viewBoxAttr) && marker->viewBoxIsValid() && marker->viewBoxCurrentValue().isEmpty())
|
| return;
|
|
|
| PaintInfo info(paintInfo);
|
| @@ -172,8 +172,8 @@ void RenderSVGResourceMarker::calcViewport()
|
| ASSERT(marker);
|
|
|
| SVGLengthContext lengthContext(marker);
|
| - float w = marker->markerWidth().value(lengthContext);
|
| - float h = marker->markerHeight().value(lengthContext);
|
| + float w = marker->markerWidthCurrentValue().value(lengthContext);
|
| + float h = marker->markerHeightCurrentValue().value(lengthContext);
|
| m_viewport = FloatRect(0, 0, w, h);
|
| }
|
|
|
|
|