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

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

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

index 1a5c5ec05aee452308ba784942091039ff3afd19..00597419509a07bf931742fc6c8b67f375f8e354 100644

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

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

@@ -995,7 +995,7 @@ IntRect LayoutObject::absoluteBoundingBoxRectIgnoringTransforms() const

IntRect LayoutObject::absoluteFocusRingBoundingBoxRect() const

{

Vector<LayoutRect> rects;

- const LayoutBoxModelObject* container = enclosingLayer()->renderer();

+ const LayoutBoxModelObject* container = enclosingLayer()->layoutObject();

addFocusRingRects(rects, LayoutPoint(localToContainerPoint(FloatPoint(), container)));

return container->localToAbsoluteQuad(FloatQuad(unionRect(rects))).enclosingBoundingBox();

}

@@ -1050,7 +1050,7 @@ const LayoutBoxModelObject* LayoutObject::enclosingCompositedContainer() const

DisableCompositingQueryAsserts disabler;

if (Layer* compositingLayer = enclosingLayer()->enclosingLayerForPaintInvalidationCrossingFrameBoundaries())

- container = compositingLayer->renderer();

+ container = compositingLayer->layoutObject();

return container;

}

@@ -1756,7 +1756,7 @@ void LayoutObject::styleWillChange(StyleDifference diff, const LayoutStyle& newS

bool newStyleSlowScroll = !shouldBlitOnFixedBackgroundImage && newStyle.hasFixedBackgroundImage();

bool oldStyleSlowScroll = m_style && !shouldBlitOnFixedBackgroundImage && m_style->hasFixedBackgroundImage();

- bool drawsRootBackground = isDocumentElement() || (isBody() && !rendererHasBackground(document().documentElement()->renderer()));

+ bool drawsRootBackground = isDocumentElement() || (isBody() && !rendererHasBackground(document().documentElement()->layoutObject()));

if (drawsRootBackground && !shouldBlitOnFixedBackgroundImage) {

if (view()->compositor()->supportsFixedRootBackgroundCompositing()) {

if (newStyleSlowScroll && newStyle.hasEntirelyFixedBackground())

@@ -2116,12 +2116,12 @@ void LayoutObject::computeLayerHitTestRects(LayerHitTestRects& layerRects) const

if (!hasLayer()) {

LayoutObject* container = this->container();

currentLayer = container->enclosingLayer();

- if (container && currentLayer->renderer() != container) {

- layerOffset.move(container->offsetFromAncestorContainer(currentLayer->renderer()));

+ if (container && currentLayer->layoutObject() != container) {

+ layerOffset.move(container->offsetFromAncestorContainer(currentLayer->layoutObject()));

// If the layer itself is scrolled, we have to undo the subtraction of its scroll

// offset since we want the offset relative to the scrolling content, not the

// element itself.

- if (currentLayer->renderer()->hasOverflowClip())

+ if (currentLayer->layoutObject()->hasOverflowClip())

layerOffset.move(currentLayer->layoutBox()->scrolledContentOffset());

}

@@ -2203,7 +2203,7 @@ LayoutObject* LayoutObject::rendererForRootBackground()

// anonymous blocks created by inline <body> tags etc. We can locate the <body>

// render object very easily via the DOM.

HTMLElement* body = document().body();

- LayoutObject* bodyObject = isHTMLBodyElement(body) ? body->renderer() : 0;

+ LayoutObject* bodyObject = isHTMLBodyElement(body) ? body->layoutObject() : 0;

if (bodyObject)

return bodyObject;

}

@@ -2713,7 +2713,7 @@ PassRefPtr<LayoutStyle> LayoutObject::getUncachedPseudoStyleFromParentOrShadowHo

if (ShadowRoot* root = node()->containingShadowRoot()) {

if (root->type() == ShadowRoot::ClosedShadowRoot) {

if (Element* shadowHost = node()->shadowHost()) {

- return shadowHost->renderer()->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));

+ return shadowHost->layoutObject()->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));

}

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