Index: Source/core/layout/LayoutInline.cpp |
diff --git a/Source/core/layout/LayoutInline.cpp b/Source/core/layout/LayoutInline.cpp |
index 52d12c8a910c1fc8e826230d5595d9be1e7e3b48..0c765d7be9df02ea0704be4edd506179fef4426f 100644 |
--- a/Source/core/layout/LayoutInline.cpp |
+++ b/Source/core/layout/LayoutInline.cpp |
@@ -587,7 +587,7 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay |
LayoutBox* currBox = toLayoutBox(curr); |
if (currBox->inlineBoxWrapper()) { |
RootInlineBox& rootBox = currBox->inlineBoxWrapper()->root(); |
- int logicalTop = rootBox.logicalTop() + (rootBox.renderer().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()); |
+ int logicalTop = rootBox.logicalTop() + (rootBox.layoutObject().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()); |
int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height(); |
if (isHorizontal) |
yield(FloatRect(currBox->inlineBoxWrapper()->x() - currBox->marginLeft(), logicalTop, (currBox->size().width() + currBox->marginWidth()).toFloat(), logicalHeight)); |
@@ -602,7 +602,7 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay |
} else { |
for (InlineFlowBox* childLine = currInline->firstLineBox(); childLine; childLine = childLine->nextLineBox()) { |
RootInlineBox& rootBox = childLine->root(); |
- int logicalTop = rootBox.logicalTop() + (rootBox.renderer().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()); |
+ int logicalTop = rootBox.logicalTop() + (rootBox.layoutObject().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()); |
int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height(); |
if (isHorizontal) { |
yield(FloatRect(childLine->x() - childLine->marginLogicalLeft(), |
@@ -621,7 +621,7 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay |
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()); |
+ int logicalTop = rootBox.logicalTop() + (rootBox.layoutObject().style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent() - container->style(rootBox.isFirstLineStyle())->font().fontMetrics().ascent()); |
int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height(); |
if (isHorizontal) |
yield(FloatRect(childText->x(), logicalTop, childText->logicalWidth(), logicalHeight)); |
@@ -1251,7 +1251,7 @@ void LayoutInline::updateHitTestResult(HitTestResult& result, const LayoutPoint& |
if (isInlineElementContinuation()) { |
// We're in the continuation of a split inline. Adjust our local point to be in the coordinate space |
// of the principal renderer's containing block. This will end up being the innerNonSharedNode. |
- LayoutBlock* firstBlock = n->renderer()->containingBlock(); |
+ LayoutBlock* firstBlock = n->layoutObject()->containingBlock(); |
// Get our containing block. |
LayoutBox* block = containingBlock(); |