Rename renderer() to layoutObject().

Source/core/layout/compositing/CompositingInputsUpdater.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/layout/compositing/CompositingInputsUpdater.h"
 
 #include "core/layout/Layer.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
@@ skipping 13 matching lines @@
 }
 
 void CompositingInputsUpdater::update()
 {
     TRACE_EVENT0("blink", "CompositingInputsUpdater::update");
     updateRecursive(m_rootLayer, DoNotForceUpdate, AncestorInfo());
 }
 
 static const Layer* findParentLayerOnClippingContainerChain(const Layer* layer)
 {
-    LayoutObject* current = layer->renderer();
+    LayoutObject* current = layer->layoutObject();
     while (current) {
         if (current->style()->position() == FixedPosition) {
             for (current = current->parent(); current && !current->canContainFixedPositionObjects(); current = current->parent()) {
                 // All types of clips apply to fixed-position descendants of other fixed-position elements.
                 // Note: it's unclear whether this is what the spec says. Firefox does not clip, but Chrome does.
                 if (current->style()->position() == FixedPosition && current->hasClipOrOverflowClip()) {
                     ASSERT(current->hasLayer());
                     return static_cast<const LayoutBoxModelObject*>(current)->layer();
                 }
 
@@ skipping 24 matching lines @@
             return static_cast<const LayoutBoxModelObject*>(current)->layer();
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 static bool hasClippedStackingAncestor(const Layer* layer, const Layer* clippingLayer)
 {
     if (layer == clippingLayer)
         return false;
-    const LayoutObject* clippingRenderer = clippingLayer->renderer();
+    const LayoutObject* clippingRenderer = clippingLayer->layoutObject();
     for (const Layer* current = layer->compositingContainer(); current && current != clippingLayer; current = current->compositingContainer()) {
-        if (current->renderer()->hasClipOrOverflowClip() && !clippingRenderer->isDescendantOf(current->renderer()))
+        if (current->layoutObject()->hasClipOrOverflowClip() && !clippingRenderer->isDescendantOf(current->layoutObject()))
             return true;
 
         if (const LayoutObject* container = current->clippingContainer()) {
             if (clippingRenderer != container && !clippingRenderer->isDescendantOf(container))
                 return true;
         }
     }
     return false;
 }
 
@@ skipping 27 matching lines @@
             IntRect clipRect = pixelSnappedIntRect(layer->clipper().backgroundClipRect(ClipRectsContext(m_rootLayer, AbsoluteClipRects)).rect());
             properties.clippedAbsoluteBoundingBox.intersect(clipRect);
 
             const Layer* parent = layer->parent();
             properties.opacityAncestor = parent->isTransparent() ? parent : parent->opacityAncestor();
             properties.transformAncestor = parent->hasTransformRelatedProperty() ? parent : parent->transformAncestor();
             properties.filterAncestor = parent->hasFilter() ? parent : parent->filterAncestor();
 
             if (info.hasAncestorWithClipOrOverflowClip) {
                 const Layer* parentLayerOnClippingContainerChain = findParentLayerOnClippingContainerChain(layer);
-                const bool parentHasClipOrOverflowClip = parentLayerOnClippingContainerChain->renderer()->hasClipOrOverflowClip();
-                properties.clippingContainer = parentHasClipOrOverflowClip ? parentLayerOnClippingContainerChain->renderer() : parentLayerOnClippingContainerChain->clippingContainer();
+                const bool parentHasClipOrOverflowClip = parentLayerOnClippingContainerChain->layoutObject()->hasClipOrOverflowClip();
+                properties.clippingContainer = parentHasClipOrOverflowClip ? parentLayerOnClippingContainerChain->layoutObject() : parentLayerOnClippingContainerChain->clippingContainer();
             }
 
             if (info.lastScrollingAncestor) {
-                const LayoutObject* containingBlock = layer->renderer()->containingBlock();
+                const LayoutObject* containingBlock = layer->layoutObject()->containingBlock();
                 const Layer* parentLayerOnContainingBlockChain = findParentLayerOnContainingBlockChain(containingBlock);
 
                 properties.ancestorScrollingLayer = parentLayerOnContainingBlockChain->ancestorScrollingLayer();
                 if (parentLayerOnContainingBlockChain->scrollsOverflow())
                     properties.ancestorScrollingLayer = parentLayerOnContainingBlockChain;
 
-                if (layer->renderer()->isOutOfFlowPositioned() && !layer->subtreeIsInvisible()) {
+                if (layer->layoutObject()->isOutOfFlowPositioned() && !layer->subtreeIsInvisible()) {
                     const Layer* clippingLayer = properties.clippingContainer ? properties.clippingContainer->enclosingLayer() : layer->compositor()->rootLayer();
                     if (hasClippedStackingAncestor(layer, clippingLayer))
                         properties.clipParent = clippingLayer;
                 }
 
                 if (!layer->stackingNode()->isNormalFlowOnly()
                     && properties.ancestorScrollingLayer
-                    && !info.ancestorStackingContext->renderer()->isDescendantOf(properties.ancestorScrollingLayer->renderer()))
+                    && !info.ancestorStackingContext->layoutObject()->isDescendantOf(properties.ancestorScrollingLayer->layoutObject()))
                     properties.scrollParent = properties.ancestorScrollingLayer;
             }
         }
 
         properties.hasAncestorWithClipPath = info.hasAncestorWithClipPath;
         layer->updateAncestorDependentCompositingInputs(properties);
     }
 
     if (layer->stackingNode()->isStackingContext())
         info.ancestorStackingContext = layer;
 
     if (layer->scrollsOverflow())
         info.lastScrollingAncestor = layer;
 
-    if (layer->renderer()->hasClipOrOverflowClip())
+    if (layer->layoutObject()->hasClipOrOverflowClip())
         info.hasAncestorWithClipOrOverflowClip = true;
 
-    if (layer->renderer()->hasClipPath())
+    if (layer->layoutObject()->hasClipPath())
         info.hasAncestorWithClipPath = true;
 
     Layer::DescendantDependentCompositingInputs descendantProperties;
     for (Layer* child = layer->firstChild(); child; child = child->nextSibling()) {
         updateRecursive(child, updateType, info);
 
-        descendantProperties.hasDescendantWithClipPath |= child->hasDescendantWithClipPath() || child->renderer()->hasClipPath();
-        descendantProperties.hasNonIsolatedDescendantWithBlendMode |= (!child->stackingNode()->isStackingContext() && child->hasNonIsolatedDescendantWithBlendMode()) || child->renderer()->style()->hasBlendMode();
+        descendantProperties.hasDescendantWithClipPath |= child->hasDescendantWithClipPath() || child->layoutObject()->hasClipPath();
+        descendantProperties.hasNonIsolatedDescendantWithBlendMode |= (!child->stackingNode()->isStackingContext() && child->hasNonIsolatedDescendantWithBlendMode()) || child->layoutObject()->style()->hasBlendMode();
     }
 
     layer->updateDescendantDependentCompositingInputs(descendantProperties);
     layer->didUpdateCompositingInputs();
 
     m_geometryMap.popMappingsToAncestor(layer->parent());
 }
 
 #if ENABLE(ASSERT)
 
 void CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(Layer* layer)
 {
     ASSERT(!layer->childNeedsCompositingInputsUpdate());
     ASSERT(!layer->needsCompositingInputsUpdate());
 
     for (Layer* child = layer->firstChild(); child; child = child->nextSibling())
         assertNeedsCompositingInputsUpdateBitsCleared(child);
 }
 
 #endif
 
 } // namespace blink