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

Unified Diff: Source/core/layout/LayoutBox.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/LayoutBox.cpp

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

index 052e2f01f00296eda3883006fe978dde97fbb6cd..a8b1866d37d0e26a11cf967eb956692ce65a1f08 100644

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

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

@@ -91,7 +91,7 @@ static bool skipBodyBackground(const LayoutBox* bodyElementRenderer)

ASSERT(bodyElementRenderer->isBody());

// The <body> only paints its background if the root element has defined a background independent of the body,

// or if the <body>'s parent is not the document element's renderer (e.g. inside SVG foreignObject).

- LayoutObject* documentElementRenderer = bodyElementRenderer->document().documentElement()->renderer();

+ LayoutObject* documentElementRenderer = bodyElementRenderer->document().documentElement()->layoutObject();

return documentElementRenderer

&& !documentElementRenderer->hasBackground()

&& (documentElementRenderer == bodyElementRenderer->parent());

@@ -496,7 +496,7 @@ void LayoutBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignmen

if (FrameView* frameView = this->frameView()) {

HTMLFrameOwnerElement* ownerElement = document().ownerElement();

- if (ownerElement && ownerElement->renderer()) {

+ if (ownerElement && ownerElement->layoutObject()) {

HTMLFrameElementBase* frameElementBase = isHTMLFrameElementBase(*ownerElement) ? toHTMLFrameElementBase(ownerElement) : 0;

if (frameElementAndViewPermitScroll(frameElementBase, frameView)) {

LayoutRect viewRect(frameView->visibleContentRect());

@@ -510,7 +510,7 @@ void LayoutBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignmen

frameView->setScrollPosition(DoublePoint(xOffset, yOffset));

if (frameView->safeToPropagateScrollToParent()) {

- parentBox = ownerElement->renderer()->enclosingBox();

+ parentBox = ownerElement->layoutObject()->enclosingBox();

// FIXME: This doesn't correctly convert the rect to

// absolute coordinates in the parent.

newRect.setX(rect.x() - frameView->scrollX() + frameView->x());

@@ -827,7 +827,7 @@ LayoutBox* LayoutBox::findAutoscrollable(LayoutObject* renderer)

{

while (renderer && !(renderer->isBox() && toLayoutBox(renderer)->canAutoscroll())) {

if (!renderer->parent() && renderer->node() == renderer->document() && renderer->document().ownerElement())

- renderer = renderer->document().ownerElement()->renderer();

+ renderer = renderer->document().ownerElement()->layoutObject();

else

renderer = renderer->parent();

}

@@ -1381,8 +1381,8 @@ bool LayoutBox::paintInvalidationLayerRectsForImage(WrappedImagePtr image, const

// A background of the body or document must extend to the total visible size of the document. This means the union of the

// view and document bounds, since it can be the case that the view is larger than the document and vice-versa.

// http://dev.w3.org/csswg/css-backgrounds/#the-background

- if (drawingBackground && (isDocumentElement() || (isBody() && !document().documentElement()->renderer()->hasBackground()))) {

- layerRenderers.append(document().documentElement()->renderer());

+ if (drawingBackground && (isDocumentElement() || (isBody() && !document().documentElement()->layoutObject()->hasBackground()))) {

+ layerRenderers.append(document().documentElement()->layoutObject());

layerRenderers.append(view());

if (view()->frameView())

view()->frameView()->setNeedsFullPaintInvalidation();

@@ -2350,7 +2350,7 @@ void LayoutBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logica

// height since we don't set a height in LayoutView when we're printing. So without this quirk, the

// height has nothing to be a percentage of, and it ends up being 0. That is bad.

bool paginatedContentNeedsBaseHeight = document().printing() && h.isPercent()

- && (isDocumentElement() || (isBody() && document().documentElement()->renderer()->style()->logicalHeight().isPercent())) && !isInline();

+ && (isDocumentElement() || (isBody() && document().documentElement()->layoutObject()->style()->logicalHeight().isPercent())) && !isInline();

if (stretchesToViewport() || paginatedContentNeedsBaseHeight) {

LayoutUnit margins = collapsedMarginBefore() + collapsedMarginAfter();

LayoutUnit visibleHeight = view()->viewLogicalHeightForPercentages();

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