Source/core/layout/LayoutInline.cpp - Issue 977113003: Rename renderer() to layoutObject().

Unified Diff: Source/core/layout/LayoutInline.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebase to master Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: Source/core/layout/LayoutInline.cpp

diff --git a/Source/core/layout/LayoutInline.cpp b/Source/core/layout/LayoutInline.cpp

index 78149334f92d2e944f35017f5f5ebdbddaa201e8..74823084a9286a97fa17ccac5e5d4c56cc6574d9 100644

--- a/Source/core/layout/LayoutInline.cpp

+++ b/Source/core/layout/LayoutInline.cpp

@@ -588,7 +588,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));

@@ -603,7 +603,7 @@ void LayoutInline::generateCulledLineBoxRects(GeneratorContext& yield, const Lay

} else {

for (InlineFlowBox* childLine = currInline->firstLineBox(); childLine; childLine = childLine->nextLineBox()) {

RootInlineBox& rootBox = childLine->root();

int logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height();

if (isHorizontal) {

yield(FloatRect(childLine->x() - childLine->marginLogicalLeft(),

@@ -622,7 +622,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 logicalHeight = container->style(rootBox.isFirstLineStyle())->font().fontMetrics().height();

if (isHorizontal)

yield(FloatRect(childText->x(), logicalTop, childText->logicalWidth(), logicalHeight));

@@ -1252,7 +1252,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();

« Source/core/html/HTMLTextAreaElement.cpp ('K') | « Source/core/layout/LayoutGeometryMap.cpp ('k') | Source/core/layout/LayoutListBox.cpp » ('j') | no next file with comments »