Index: Source/core/rendering/RenderInline.cpp |
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp |
index 7c27882c5f2f7f0c4835ecccddcea81984576ffc..4f074ffa7195e70093a40f73352fe793a6bd84df 100644 |
--- a/Source/core/rendering/RenderInline.cpp |
+++ b/Source/core/rendering/RenderInline.cpp |
@@ -259,7 +259,7 @@ LayoutRect RenderInline::localCaretRect(InlineBox* inlineBox, int, LayoutUnit* e |
if (firstChild()) { |
// This condition is possible if the RenderInline is at an editing boundary, |
// i.e. the VisiblePosition is: |
- // <RenderInline editingBoundary=true>|<RenderText> </RenderText></RenderInline> |
+ // <RenderInline editingBoundary=true>|<LayoutText> </LayoutText></RenderInline> |
// FIXME: need to figure out how to make this return a valid rect, note that |
// there are no line boxes created in the above case. |
return LayoutRect(); |
@@ -618,7 +618,7 @@ void RenderInline::generateCulledLineBoxRects(GeneratorContext& yield, const Ren |
} |
} |
} else if (curr->isText()) { |
- RenderText* currText = toRenderText(curr); |
+ LayoutText* currText = toLayoutText(curr); |
for (InlineTextBox* childText = currText->firstTextBox(); childText; childText = childText->nextTextBox()) { |
RootInlineBox& rootBox = childText->root(); |
int logicalTop = rootBox.logicalTop() + (rootBox.renderer().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()); |
@@ -924,7 +924,7 @@ InlineBox* RenderInline::culledInlineFirstLineBox() const |
if (result) |
return result; |
} else if (curr->isText()) { |
- RenderText* currText = toRenderText(curr); |
+ LayoutText* currText = toLayoutText(curr); |
if (currText->firstTextBox()) |
return currText->firstTextBox(); |
} |
@@ -948,7 +948,7 @@ InlineBox* RenderInline::culledInlineLastLineBox() const |
if (result) |
return result; |
} else if (curr->isText()) { |
- RenderText* currText = toRenderText(curr); |
+ LayoutText* currText = toLayoutText(curr); |
if (currText->lastTextBox()) |
return currText->lastTextBox(); |
} |
@@ -990,7 +990,7 @@ LayoutRect RenderInline::culledInlineVisualOverflowBoundingBox() const |
} else if (curr->isText()) { |
// FIXME; Overflow from text boxes is lost. We will need to cache this information in |
// InlineTextBoxes. |
- RenderText* currText = toRenderText(curr); |
+ LayoutText* currText = toLayoutText(curr); |
result.uniteIfNonZero(currText->linesVisualOverflowBoundingBox()); |
} |
} |
@@ -1285,7 +1285,7 @@ void RenderInline::dirtyLineBoxes(bool fullLayout) |
for (InlineFlowBox* childLine = currInline->firstLineBox(); childLine; childLine = childLine->nextLineBox()) |
childLine->root().markDirty(); |
} else if (curr->isText()) { |
- RenderText* currText = toRenderText(curr); |
+ LayoutText* currText = toLayoutText(curr); |
for (InlineTextBox* childText = currText->firstTextBox(); childText; childText = childText->nextTextBox()) |
childText->root().markDirty(); |
} |