| Index: Source/core/rendering/svg/SVGTextLayoutEngine.cpp
|
| diff --git a/Source/core/rendering/svg/SVGTextLayoutEngine.cpp b/Source/core/rendering/svg/SVGTextLayoutEngine.cpp
|
| index 0ade353f4a7988e8b1818f792697df9c945c065f..78da01d1d3a511382770119fa1e6e5e66cc9d1a8 100644
|
| --- a/Source/core/rendering/svg/SVGTextLayoutEngine.cpp
|
| +++ b/Source/core/rendering/svg/SVGTextLayoutEngine.cpp
|
| @@ -148,7 +148,7 @@ bool SVGTextLayoutEngine::parentDefinesTextLength(RenderObject* parent) const
|
| while (currentParent) {
|
| if (SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromRenderer(currentParent)) {
|
| SVGLengthContext lengthContext(textContentElement);
|
| - if (textContentElement->lengthAdjustCurrentValue() == SVGLengthAdjustSpacing && textContentElement->specifiedTextLength().value(lengthContext) > 0)
|
| + if (textContentElement->lengthAdjustCurrentValue() == SVGLengthAdjustSpacing && textContentElement->textLengthIsSpecifiedByUser())
|
| return true;
|
| }
|
|
|
| @@ -207,7 +207,10 @@ void SVGTextLayoutEngine::beginTextPathLayout(RenderObject* object, SVGTextLayou
|
| if (SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromRenderer(textPath)) {
|
| SVGLengthContext lengthContext(textContentElement);
|
| lengthAdjust = textContentElement->lengthAdjustCurrentValue();
|
| - desiredTextLength = textContentElement->specifiedTextLength().value(lengthContext);
|
| + if (textContentElement->textLengthIsSpecifiedByUser())
|
| + desiredTextLength = textContentElement->textLength()->currentValue()->value(lengthContext);
|
| + else
|
| + desiredTextLength = 0;
|
| }
|
|
|
| if (!desiredTextLength)
|
|
|