Chromium Code Reviews| 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..68c6617afc0cb6a045b5a501b751eb142244ab91 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,8 @@ 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()) |
|
haraken
2014/01/09 00:58:53
Don't you need to add:
else {
desiredTextLe
kouhei (in TOK)
2014/01/09 02:24:51
Done.
|
| + desiredTextLength = textContentElement->textLength()->currentValue()->value(lengthContext); |
| } |
| if (!desiredTextLength) |