| Index: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
|
| index d8b3a66a73aa676ec94efc5d53faed9f17d75b5d..ed3dbe7753eb0f519ebb56a439fd2d1761f7ceda 100644
|
| --- a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.cpp
|
| @@ -191,7 +191,7 @@ void SVGTextLayoutEngine::beginTextPathLayout(SVGInlineFlowBox* flowBox)
|
| SVGLengthAdjustType lengthAdjust = SVGLengthAdjustUnknown;
|
| float desiredTextLength = 0;
|
|
|
| - if (SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromLayoutObject(LineLayoutAPIShim::layoutObjectFrom(textPath))) {
|
| + if (SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromLayoutObject(textPath)) {
|
| SVGLengthContext lengthContext(textContentElement);
|
| lengthAdjust = textContentElement->lengthAdjust()->currentValue()->enumValue();
|
| if (textContentElement->textLengthIsSpecifiedByUser())
|
| @@ -245,7 +245,7 @@ void SVGTextLayoutEngine::layoutInlineTextBox(SVGInlineTextBox* textBox)
|
|
|
| static bool definesTextLengthWithSpacing(const InlineFlowBox* start)
|
| {
|
| - SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromLayoutObject(&start->layoutObject());
|
| + SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromLayoutObject(start->lineLayoutItem());
|
| return textContentElement
|
| && textContentElement->lengthAdjust()->currentValue()->enumValue() == SVGLengthAdjustSpacing
|
| && textContentElement->textLengthIsSpecifiedByUser();
|
|
|