| Index: Source/core/svg/SVGPatternElement.cpp
|
| diff --git a/Source/core/svg/SVGPatternElement.cpp b/Source/core/svg/SVGPatternElement.cpp
|
| index d622340909e286116ac3fb39f87547aae3a87fd5..b38307fe94ae9d836d89ac89ddaf60b71d581d4f 100644
|
| --- a/Source/core/svg/SVGPatternElement.cpp
|
| +++ b/Source/core/svg/SVGPatternElement.cpp
|
| @@ -182,32 +182,32 @@ void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
|
| const SVGPatternElement* current = this;
|
| while (current) {
|
| if (!attributes.hasX() && current->hasAttribute(SVGNames::xAttr))
|
| - attributes.setX(current->x());
|
| + attributes.setX(current->xCurrentValue());
|
|
|
| if (!attributes.hasY() && current->hasAttribute(SVGNames::yAttr))
|
| - attributes.setY(current->y());
|
| + attributes.setY(current->yCurrentValue());
|
|
|
| if (!attributes.hasWidth() && current->hasAttribute(SVGNames::widthAttr))
|
| - attributes.setWidth(current->width());
|
| + attributes.setWidth(current->widthCurrentValue());
|
|
|
| if (!attributes.hasHeight() && current->hasAttribute(SVGNames::heightAttr))
|
| - attributes.setHeight(current->height());
|
| + attributes.setHeight(current->heightCurrentValue());
|
|
|
| if (!attributes.hasViewBox() && current->hasAttribute(SVGNames::viewBoxAttr) && current->viewBoxIsValid())
|
| - attributes.setViewBox(current->viewBox());
|
| + attributes.setViewBox(current->viewBoxCurrentValue());
|
|
|
| if (!attributes.hasPreserveAspectRatio() && current->hasAttribute(SVGNames::preserveAspectRatioAttr))
|
| - attributes.setPreserveAspectRatio(current->preserveAspectRatio());
|
| + attributes.setPreserveAspectRatio(current->preserveAspectRatioCurrentValue());
|
|
|
| if (!attributes.hasPatternUnits() && current->hasAttribute(SVGNames::patternUnitsAttr))
|
| - attributes.setPatternUnits(current->patternUnits());
|
| + attributes.setPatternUnits(current->patternUnitsCurrentValue());
|
|
|
| if (!attributes.hasPatternContentUnits() && current->hasAttribute(SVGNames::patternContentUnitsAttr))
|
| - attributes.setPatternContentUnits(current->patternContentUnits());
|
| + attributes.setPatternContentUnits(current->patternContentUnitsCurrentValue());
|
|
|
| if (!attributes.hasPatternTransform() && current->hasAttribute(SVGNames::patternTransformAttr)) {
|
| AffineTransform transform;
|
| - current->patternTransform().concatenate(transform);
|
| + current->patternTransformCurrentValue().concatenate(transform);
|
| attributes.setPatternTransform(transform);
|
| }
|
|
|
| @@ -217,7 +217,7 @@ void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
|
| processedPatterns.add(current);
|
|
|
| // Respect xlink:href, take attributes from referenced element
|
| - Node* refNode = SVGURIReference::targetElementFromIRIString(current->href(), document());
|
| + Node* refNode = SVGURIReference::targetElementFromIRIString(current->hrefCurrentValue(), document());
|
| if (refNode && refNode->hasTagName(SVGNames::patternTag)) {
|
| current = static_cast<const SVGPatternElement*>(const_cast<const Node*>(refNode));
|
|
|
| @@ -234,16 +234,16 @@ void SVGPatternElement::collectPatternAttributes(PatternAttributes& attributes)
|
| AffineTransform SVGPatternElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
|
| {
|
| AffineTransform matrix;
|
| - patternTransform().concatenate(matrix);
|
| + patternTransformCurrentValue().concatenate(matrix);
|
| return matrix;
|
| }
|
|
|
| bool SVGPatternElement::selfHasRelativeLengths() const
|
| {
|
| - return x().isRelative()
|
| - || y().isRelative()
|
| - || width().isRelative()
|
| - || height().isRelative();
|
| + return xCurrentValue().isRelative()
|
| + || yCurrentValue().isRelative()
|
| + || widthCurrentValue().isRelative()
|
| + || heightCurrentValue().isRelative();
|
| }
|
|
|
| }
|
|
|