Index: Source/core/layout/svg/line/SVGRootInlineBox.cpp |
diff --git a/Source/core/layout/svg/line/SVGRootInlineBox.cpp b/Source/core/layout/svg/line/SVGRootInlineBox.cpp |
index 18b7dc59b8772c826ae9102d7638c77e1f40c249..900b1d7570ea6e0cdd4b6499cd76b2e6b876f08c 100644 |
--- a/Source/core/layout/svg/line/SVGRootInlineBox.cpp |
+++ b/Source/core/layout/svg/line/SVGRootInlineBox.cpp |
@@ -73,11 +73,11 @@ void SVGRootInlineBox::layoutCharactersInTextBoxes(InlineFlowBox* start, SVGText |
{ |
for (InlineBox* child = start->firstChild(); child; child = child->nextOnLine()) { |
if (child->isSVGInlineTextBox()) { |
- ASSERT(child->renderer().isSVGInlineText()); |
+ ASSERT(child->layoutObject().isSVGInlineText()); |
characterLayout.layoutInlineTextBox(toSVGInlineTextBox(child)); |
} else { |
// Skip generated content. |
- Node* node = child->renderer().node(); |
+ Node* node = child->layoutObject().node(); |
if (!node) |
continue; |
@@ -89,7 +89,7 @@ void SVGRootInlineBox::layoutCharactersInTextBoxes(InlineFlowBox* start, SVGText |
SVGTextLayoutEngine lineLayout(characterLayout.layoutAttributes()); |
layoutCharactersInTextBoxes(flowBox, lineLayout); |
- characterLayout.beginTextPathLayout(&child->renderer(), lineLayout); |
+ characterLayout.beginTextPathLayout(&child->layoutObject(), lineLayout); |
} |
layoutCharactersInTextBoxes(flowBox, characterLayout); |
@@ -105,7 +105,7 @@ void SVGRootInlineBox::layoutChildBoxes(InlineFlowBox* start, FloatRectWillBeLay |
for (InlineBox* child = start->firstChild(); child; child = child->nextOnLine()) { |
FloatRectWillBeLayoutRect boxRect; |
if (child->isSVGInlineTextBox()) { |
- ASSERT(child->renderer().isSVGInlineText()); |
+ ASSERT(child->layoutObject().isSVGInlineText()); |
SVGInlineTextBox* textBox = toSVGInlineTextBox(child); |
boxRect = textBox->calculateBoundaries(); |
@@ -115,7 +115,7 @@ void SVGRootInlineBox::layoutChildBoxes(InlineFlowBox* start, FloatRectWillBeLay |
textBox->setLogicalHeight(boxRect.height()); |
} else { |
// Skip generated content. |
- if (!child->renderer().node()) |
+ if (!child->layoutObject().node()) |
continue; |
SVGInlineFlowBox* flowBox = toSVGInlineFlowBox(child); |
@@ -146,7 +146,7 @@ void SVGRootInlineBox::layoutRootBox(const FloatRectWillBeLayoutRect& childRect) |
// Position all children relative to the parent block. |
for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) { |
// Skip generated content. |
- if (!child->renderer().node()) |
+ if (!child->layoutObject().node()) |
continue; |
child->adjustPosition(-childRect.x(), -childRect.y()); |
} |
@@ -240,8 +240,8 @@ static inline void reverseInlineBoxRangeAndValueListsIfNeeded(void* userData, Ve |
// Reordering is only necessary for BiDi text that is _absolutely_ positioned. |
if (firstTextBox->len() == 1 && firstTextBox->len() == lastTextBox->len()) { |
- LayoutSVGInlineText& firstContext = toLayoutSVGInlineText(firstTextBox->renderer()); |
- LayoutSVGInlineText& lastContext = toLayoutSVGInlineText(lastTextBox->renderer()); |
+ LayoutSVGInlineText& firstContext = toLayoutSVGInlineText(firstTextBox->layoutObject()); |
+ LayoutSVGInlineText& lastContext = toLayoutSVGInlineText(lastTextBox->layoutObject()); |
SVGTextLayoutAttributes* firstAttributes = 0; |
SVGTextLayoutAttributes* lastAttributes = 0; |