Convert LayoutObject renderer names.

Source/core/layout/LayoutObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 106 matching lines @@
     LayoutRect bounds;
     bool draggable;
 };
 
 typedef WTF::HashMap<const DeprecatedPaintLayer*, Vector<LayoutRect>> LayerHitTestRects;
 
 #ifndef NDEBUG
 const int showTreeCharacterOffset = 39;
 #endif
 
-// Base class for all rendering tree objects.
+// Base class for all layout tree objects.
 class CORE_EXPORT LayoutObject : public ImageResourceClient {
     friend class LayoutBlock;
     friend class LayoutBlockFlow;
     friend class DeprecatedPaintLayerReflectionInfo; // For setParent
     friend class DeprecatedPaintLayerScrollableArea; // For setParent.
     friend class LayoutObjectChildList;
     WTF_MAKE_NONCOPYABLE(LayoutObject);
 public:
     // Anonymous objects should pass the document as their node, and they will then automatically be
     // marked as anonymous in the constructor.
@@ skipping 37 matching lines @@
     LayoutObject* nextInPreOrder() const;
     LayoutObject* nextInPreOrder(const LayoutObject* stayWithin) const;
     LayoutObject* nextInPreOrderAfterChildren() const;
     LayoutObject* nextInPreOrderAfterChildren(const LayoutObject* stayWithin) const;
     LayoutObject* previousInPreOrder() const;
     LayoutObject* previousInPreOrder(const LayoutObject* stayWithin) const;
     LayoutObject* childAt(unsigned) const;
 
     LayoutObject* lastLeafChild() const;
 
-    // The following six functions are used when the render tree hierarchy changes to make sure layers get
+    // The following six functions are used when the layout tree hierarchy changes to make sure layers get
     // properly added and removed.  Since containership can be implemented by any subclass, and since a hierarchy
     // can contain a mixture of boxes and other object types, these functions need to be in the base class.
     DeprecatedPaintLayer* enclosingLayer() const;
     void addLayers(DeprecatedPaintLayer* parentLayer);
     void removeLayers(DeprecatedPaintLayer* parentLayer);
     void moveLayers(DeprecatedPaintLayer* oldParent, DeprecatedPaintLayer* newParent);
     DeprecatedPaintLayer* findNextLayer(DeprecatedPaintLayer* parentLayer, LayoutObject* startPoint, bool checkParent = true);
 
     // Scrolling is a LayoutBox concept, however some code just cares about recursively scrolling our enclosing ScrollableArea(s).
     bool scrollRectToVisible(const LayoutRect&, const ScrollAlignment& alignX = ScrollAlignment::alignCenterIfNeeded, const ScrollAlignment& alignY = ScrollAlignment::alignCenterIfNeeded);
@@ skipping 20 matching lines @@
     // Helper class forbidding calls to setNeedsLayout() during its lifetime.
     class SetLayoutNeededForbiddenScope {
     public:
         explicit SetLayoutNeededForbiddenScope(LayoutObject&);
         ~SetLayoutNeededForbiddenScope();
     private:
         LayoutObject& m_layoutObject;
         bool m_preexistingForbidden;
     };
 
-    void assertRendererLaidOut() const
+    void assertLaidOut() const
     {
 #ifndef NDEBUG
         if (needsLayout())
             showLayoutTreeForThis();
 #endif
         ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
     }
 
     void assertSubtreeIsLaidOut() const
     {
-        for (const LayoutObject* renderer = this; renderer; renderer = renderer->nextInPreOrder())
-            renderer->assertRendererLaidOut();
+        for (const LayoutObject* layoutObject = this; layoutObject; layoutObject = layoutObject->nextInPreOrder())
+            layoutObject->assertLaidOut();
     }
 
-    void assertRendererClearedPaintInvalidationState() const
+    void assertClearedPaintInvalidationState() const
     {
 #ifndef NDEBUG
         if (paintInvalidationStateIsDirty()) {
             showLayoutTreeForThis();
             ASSERT_NOT_REACHED();
         }
 #endif
     }
 
     void assertSubtreeClearedPaintInvalidationState() const
     {
-        for (const LayoutObject* renderer = this; renderer; renderer = renderer->nextInPreOrder())
-            renderer->assertRendererClearedPaintInvalidationState();
+        for (const LayoutObject* layoutObject = this; layoutObject; layoutObject = layoutObject->nextInPreOrder())
+            layoutObject->assertClearedPaintInvalidationState();
     }
 
 #endif
 
-    // Correct version of !rendererHasNoBoxEffectObsolete().
+    // Correct version of !layoutObjectHasNoBoxEffectObsolete().
     bool hasBoxEffect() const
     {
         return hasBoxDecorationBackground() || style()->hasVisualOverflowingEffect();
     }
 
     // Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline
     // children.
     virtual LayoutBlock* firstLineBlock() const;
 
     // LayoutObject tree manipulation
@@ skipping 165 matching lines @@
         NotInsideFlowThread = 0,
         InsideOutOfFlowThread = 1,
         InsideInFlowThread = 2,
     };
 
     void setFlowThreadStateIncludingDescendants(FlowThreadState);
 
     FlowThreadState flowThreadState() const { return m_bitfields.flowThreadState(); }
     void setFlowThreadState(FlowThreadState state) { m_bitfields.setFlowThreadState(state); }
 
-    // FIXME: Until all SVG renders can be subclasses of LayoutSVGModelObject we have
-    // to add SVG renderer methods to LayoutObject with an ASSERT_NOT_REACHED() default implementation.
+    // FIXME: Until all SVG layoutObjects can be subclasses of LayoutSVGModelObject we have
+    // to add SVG layoutObject methods to LayoutObject with an ASSERT_NOT_REACHED() default implementation.
     bool isSVG() const { return isOfType(LayoutObjectSVG); }
     bool isSVGRoot() const { return isOfType(LayoutObjectSVGRoot); }
     bool isSVGContainer() const { return isOfType(LayoutObjectSVGContainer); }
     bool isSVGTransformableContainer() const { return isOfType(LayoutObjectSVGTransformableContainer); }
     bool isSVGViewportContainer() const { return isOfType(LayoutObjectSVGViewportContainer); }
     bool isSVGGradientStop() const { return isOfType(LayoutObjectSVGGradientStop); }
     bool isSVGHiddenContainer() const { return isOfType(LayoutObjectSVGHiddenContainer); }
     bool isSVGShape() const { return isOfType(LayoutObjectSVGShape); }
     bool isSVGText() const { return isOfType(LayoutObjectSVGText); }
     bool isSVGTextPath() const { return isOfType(LayoutObjectSVGTextPath); }
     bool isSVGInline() const { return isOfType(LayoutObjectSVGInline); }
     bool isSVGInlineText() const { return isOfType(LayoutObjectSVGInlineText); }
     bool isSVGImage() const { return isOfType(LayoutObjectSVGImage); }
     bool isSVGForeignObject() const { return isOfType(LayoutObjectSVGForeignObject); }
     bool isSVGResourceContainer() const { return isOfType(LayoutObjectSVGResourceContainer); }
     bool isSVGResourceFilter() const { return isOfType(LayoutObjectSVGResourceFilter); }
     bool isSVGResourceFilterPrimitive() const { return isOfType(LayoutObjectSVGResourceFilterPrimitive); }
 
-    // FIXME: Those belong into a SVG specific base-class for all renderers (see above)
-    // Unfortunately we don't have such a class yet, because it's not possible for all renderers
+    // FIXME: Those belong into a SVG specific base-class for all layoutObjects (see above)
+    // Unfortunately we don't have such a class yet, because it's not possible for all layoutObjects
     // to inherit from LayoutSVGObject -> LayoutObject (some need LayoutBlock inheritance for instance)
     virtual void setNeedsTransformUpdate() { }
     virtual void setNeedsBoundariesUpdate();
 
     bool isBlendingAllowed() const { return !isSVG() || (isSVGContainer() && !isSVGHiddenContainer()) || isSVGShape() || isSVGImage() || isSVGText(); }
     virtual bool hasNonIsolatedBlendingDescendants() const { return false; }
     enum DescendantIsolationState {
         DescendantIsolationRequired,
         DescendantIsolationNeedsUpdate,
     };
     virtual void descendantIsolationRequirementsChanged(DescendantIsolationState) { }
 
     // Per SVG 1.1 objectBoundingBox ignores clipping, masking, filter effects, opacity and stroke-width.
     // This is used for all computation of objectBoundingBox relative units and by SVGLocatable::getBBox().
     // NOTE: Markers are not specifically ignored here by SVG 1.1 spec, but we ignore them
     // since stroke-width is ignored (and marker size can depend on stroke-width).
     // objectBoundingBox is returned local coordinates.
     // The name objectBoundingBox is taken from the SVG 1.1 spec.
     virtual FloatRect objectBoundingBox() const;
     virtual FloatRect strokeBoundingBox() const;
 
     // Returns the smallest rectangle enclosing all of the painted content
     // respecting clipping, masking, filters, opacity, stroke-width and markers
     virtual FloatRect paintInvalidationRectInLocalCoordinates() const;
 
     // This only returns the transform="" value from the element
     // most callsites want localToParentTransform() instead.
     virtual AffineTransform localTransform() const;
 
-    // Returns the full transform mapping from local coordinates to local coords for the parent SVG renderer
+    // Returns the full transform mapping from local coordinates to local coords for the parent SVG layoutObject
     // This includes any viewport transforms and x/y offsets as well as the transform="" value off the element.
     virtual const AffineTransform& localToParentTransform() const;
 
     // SVG uses FloatPoint precise hit testing, and passes the point in parent
     // coordinates instead of in paint invalidaiton container coordinates. Eventually the
-    // rest of the rendering tree will move to a similar model.
+    // rest of the layout tree will move to a similar model.
     virtual bool nodeAtFloatPoint(HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
 
     bool isAnonymous() const { return m_bitfields.isAnonymous(); }
     bool isAnonymousBlock() const
     {
         // This function is kept in sync with anonymous block creation conditions in
         // LayoutBlock::createAnonymousBlock(). This includes creating an anonymous
         // LayoutBlock having a BLOCK or BOX display. Other classes such as LayoutTextFragment
         // are not LayoutBlocks and will return false. See https://bugs.webkit.org/show_bug.cgi?id=56709.
         return isAnonymous() && (style()->display() == BLOCK || style()->display() == BOX) && style()->styleType() == NOPSEUDO && isLayoutBlock() && !isListMarker() && !isLayoutFlowThread() && !isLayoutMultiColumnSet()
@@ skipping 104 matching lines @@
     }
 
     Node* nonPseudoNode() const
     {
         return isPseudoElement() ? 0 : node();
     }
 
     // FIXME: Why does LayoutPart need this? crbug.com/422457
     void clearNode() { m_node = nullptr; }
 
-    // Returns the styled node that caused the generation of this renderer.
-    // This is the same as node() except for renderers of :before, :after and
+    // Returns the styled node that caused the generation of this layoutObject.
+    // This is the same as node() except for layoutObjects of :before, :after and
     // :first-letter pseudo elements for which their parent node is returned.
     Node* generatingNode() const { return isPseudoElement() ? node()->parentOrShadowHostNode() : node(); }
 
     Document& document() const { return m_node->document(); }
     LocalFrame* frame() const { return document().frame(); }
 
     virtual LayoutMultiColumnSpannerPlaceholder* spannerPlaceholder() const { return 0; }
     bool isColumnSpanAll() const { return style()->columnSpan() == ColumnSpanAll && spannerPlaceholder(); }
 
     // Returns the object containing this one. Can be different from parent for positioned elements.
     // If paintInvalidationContainer and paintInvalidationContainerSkipped are not null, on return *paintInvalidationContainerSkipped
-    // is true if the renderer returned is an ancestor of paintInvalidationContainer.
+    // is true if the layoutObject returned is an ancestor of paintInvalidationContainer.
     LayoutObject* container(const LayoutBoxModelObject* paintInvalidationContainer = 0, bool* paintInvalidationContainerSkipped = 0) const;
     LayoutBlock* containerForFixedPosition(const LayoutBoxModelObject* paintInvalidationContainer = 0, bool* paintInvalidationContainerSkipped = 0) const;
 
     virtual LayoutObject* hoverAncestor() const { return parent(); }
 
     Element* offsetParent() const;
 
     void markContainerChainForLayout(bool scheduleRelayout = true, LayoutObject* newRoot = 0, SubtreeLayoutScope* = 0);
     void setNeedsLayout(LayoutInvalidationReasonForTracing, MarkingBehavior = MarkContainerChain, SubtreeLayoutScope* = 0);
     void setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReasonForTracing, MarkingBehavior = MarkContainerChain, SubtreeLayoutScope* = 0);
@@ skipping 115 matching lines @@
     // Convert an absolute quad to local coordinates.
     FloatQuad absoluteToLocalQuad(const FloatQuad&, MapCoordinatesFlags mode = 0) const;
 
     // Convert a local quad into the coordinate system of container, taking transforms into account.
     FloatQuad localToContainerQuad(const FloatQuad&, const LayoutBoxModelObject* paintInvalidatinoContainer, MapCoordinatesFlags = 0, bool* wasFixed = 0) const;
     FloatPoint localToContainerPoint(const FloatPoint&, const LayoutBoxModelObject* paintInvalidationContainer, MapCoordinatesFlags = 0, bool* wasFixed = 0, const PaintInvalidationState* = 0) const;
 
     // Convert a local point into the coordinate system of backing coordinates. Also returns the backing layer if needed.
     FloatPoint localToInvalidationBackingPoint(const LayoutPoint&, DeprecatedPaintLayer** backingLayer = nullptr);
 
-    // Return the offset from the container() renderer (excluding transforms). In multi-column layout,
+    // Return the offset from the container() layoutObject (excluding transforms). In multi-column layout,
     // different offsets apply at different points, so return the offset that applies to the given point.
     virtual LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const;
     // Return the offset from an object up the container() chain. Asserts that none of the intermediate objects have transforms.
     LayoutSize offsetFromAncestorContainer(const LayoutObject*) const;
 
     virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint&) const { }
 
     FloatRect absoluteBoundingBoxFloatRect() const;
     // This returns an IntRect enclosing this object. If this object has an
     // integral size and the position has fractional values, the resultant
@@ skipping 62 matching lines @@
     bool isPaintInvalidationContainer() const;
 
     LayoutRect computePaintInvalidationRect()
     {
         return computePaintInvalidationRect(containerForPaintInvalidation());
     }
 
     // Returns the paint invalidation rect for this LayoutObject in the coordinate space of the paint backing (typically a GraphicsLayer) for |paintInvalidationContainer|.
     LayoutRect computePaintInvalidationRect(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const;
 
-    // Returns the rect bounds needed to invalidate the paint of this object, in the coordinate space of the rendering backing of |paintInvalidationContainer|
+    // Returns the rect bounds needed to invalidate the paint of this object, in the coordinate space of the layoutObject backing of |paintInvalidationContainer|
     LayoutRect boundsRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const;
 
     // Actually do the paint invalidate of rect r for this object which has been computed in the coordinate space
     // of the GraphicsLayer backing of |paintInvalidationContainer|. Note that this coordinaten space is not the same
     // as the local coordinate space of |paintInvalidationContainer| in the presence of layer squashing.
     // If |paintInvalidationContainer| is 0, invalidate paints via the view.
     // FIXME: |paintInvalidationContainer| should never be 0. See crbug.com/363699.
     void invalidatePaintUsingContainer(const LayoutBoxModelObject* paintInvalidationContainer, const LayoutRect&, PaintInvalidationReason) const;
 
     // Invalidate the paint of a specific subrectangle within a given object. The rect |r| is in the object's coordinate space.
     void invalidatePaintRectangle(const LayoutRect&) const;
     void invalidatePaintRectangleNotInvalidatingDisplayItemClients(const LayoutRect& r) const { invalidatePaintRectangleInternal(r); }
 
-    // Walk the tree after layout issuing paint invalidations for renderers that have changed or moved, updating bounds that have changed, and clearing paint invalidation state.
+    // Walk the tree after layout issuing paint invalidations for layoutObjects that have changed or moved, updating bounds that have changed, and clearing paint invalidation state.
     virtual void invalidateTreeIfNeeded(PaintInvalidationState&);
 
     virtual void invalidatePaintForOverflow();
     void invalidatePaintForOverflowIfNeeded();
 
     void invalidatePaintIncludingNonCompositingDescendants();
 
     // Returns the rect that should have paint invalidated whenever this object changes. The rect is in the view's
     // coordinate space. This method deals with outlines and overflow.
     virtual LayoutRect absoluteClippedOverflowRect() const;
@@ skipping 45 matching lines @@
     bool isSelectable() const;
     // Obtains the selection colors that should be used when painting a selection.
     Color selectionBackgroundColor() const;
     Color selectionForegroundColor() const;
     Color selectionEmphasisMarkColor() const;
 
     // Whether or not a given block needs to paint selection gaps.
     virtual bool shouldPaintSelectionGaps() const { return false; }
 
     /**
-     * Returns the local coordinates of the caret within this render object.
-     * @param caretOffset zero-based offset determining position within the render object.
+     * Returns the local coordinates of the caret within this layout object.
+     * @param caretOffset zero-based offset determining position within the layout object.
      * @param extraWidthToEndOfLine optional out arg to give extra width to end of line -
      * useful for character range rect computations
      */
     virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0);
 
-    // When performing a global document tear-down, the renderer of the document is cleared. We use this
+    // When performing a global document tear-down, the layoutObject of the document is cleared. We use this
     // as a hook to detect the case of document destruction and don't waste time doing unnecessary work.
     bool documentBeingDestroyed() const;
 
     void destroyAndCleanupAnonymousWrappers();
     virtual void destroy();
 
     // Virtual function helpers for the deprecated Flexible Box Layout (display: -webkit-box).
     virtual bool isDeprecatedFlexibleBox() const { return false; }
 
     // Virtual function helper for the new FlexibleBox Layout (display: -webkit-flex).
@@ skipping 32 matching lines @@
 
     bool visibleToHitTestRequest(const HitTestRequest& request) const { return style()->visibility() == VISIBLE && (request.ignorePointerEventsNone() || style()->pointerEvents() != PE_NONE) && !isInert(); }
 
     bool visibleToHitTesting() const { return style()->visibility() == VISIBLE && style()->pointerEvents() != PE_NONE && !isInert(); }
 
     // Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use
     // localToAbsolute/absoluteToLocal methods instead.
     virtual void mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const;
     virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const;
 
-    // Pushes state onto LayoutGeometryMap about how to map coordinates from this renderer to its container, or ancestorToStopAt (whichever is encountered first).
-    // Returns the renderer which was mapped to (container or ancestorToStopAt).
+    // Pushes state onto LayoutGeometryMap about how to map coordinates from this layoutObject to its container, or ancestorToStopAt (whichever is encountered first).
+    // Returns the layoutObject which was mapped to (container or ancestorToStopAt).
     virtual const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const;
 
     bool shouldUseTransformFromContainer(const LayoutObject* container) const;
     void getTransformFromContainer(const LayoutObject* container, const LayoutSize& offsetInContainer, TransformationMatrix&) const;
 
     bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || style()->hasBlendMode(); }
 
     virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset) const { }
 
-    // Compute a list of hit-test rectangles per layer rooted at this renderer.
+    // Compute a list of hit-test rectangles per layer rooted at this layoutObject.
     virtual void computeLayerHitTestRects(LayerHitTestRects&) const;
 
-    // Return the renderer whose background style is used to paint the root background. Should only be called on the renderer for which isDocumentElement() is true.
-    LayoutObject* rendererForRootBackground();
+    // Return the layoutObject whose background style is used to paint the root background. Should only be called on the layoutObject for which isDocumentElement() is true.
+    LayoutObject* layoutObjectForRootBackground();
 
     RespectImageOrientationEnum shouldRespectImageOrientation() const;
 
     bool isRelayoutBoundaryForInspector() const;
 
     // The previous paint invalidation rect in the object's previous paint backing.
     const LayoutRect& previousPaintInvalidationRect() const { return m_previousPaintInvalidationRect; }
     void setPreviousPaintInvalidationRect(const LayoutRect& rect) { m_previousPaintInvalidationRect = rect; }
 
     // The previous position of the top-left corner of the object in its previous paint backing.
     const LayoutPoint& previousPositionFromPaintInvalidationBacking() const { return m_previousPositionFromPaintInvalidationBacking; }
     void setPreviousPositionFromPaintInvalidationBacking(const LayoutPoint& positionFromPaintInvalidationBacking) { m_previousPositionFromPaintInvalidationBacking = positionFromPaintInvalidationBacking; }
 
     bool shouldDoFullPaintInvalidation() const { return m_bitfields.fullPaintInvalidationReason() != PaintInvalidationNone; }
     void setShouldDoFullPaintInvalidation(PaintInvalidationReason = PaintInvalidationFull);
     void clearShouldDoFullPaintInvalidation() { m_bitfields.setFullPaintInvalidationReason(PaintInvalidationNone); }
 
     bool shouldInvalidateOverflowForPaint() const { return m_bitfields.shouldInvalidateOverflowForPaint(); }
 
     virtual void clearPaintInvalidationState(const PaintInvalidationState&);
 
-    // Indicates whether this render object was re-laid-out since the last frame.
+    // Indicates whether this layout object was re-laid-out since the last frame.
     // The flag will be cleared during invalidateTreeIfNeeded.
     bool layoutDidGetCalledSinceLastFrame() const { return m_bitfields.layoutDidGetCalledSinceLastFrame(); }
 
     bool mayNeedPaintInvalidation() const { return m_bitfields.mayNeedPaintInvalidation(); }
     void setMayNeedPaintInvalidation();
 
     bool shouldInvalidateSelection() const { return m_bitfields.shouldInvalidateSelection(); }
     void setShouldInvalidateSelection();
     void clearShouldInvalidateSelection() { m_bitfields.setShouldInvalidateSelection(false); }
 
@@ skipping 108 matching lines @@
 
     void clearLayoutRootIfNeeded() const;
     virtual void willBeDestroyed();
     void postDestroy();
 
     virtual void insertedIntoTree();
     virtual void willBeRemovedFromTree();
 
     void setDocumentForAnonymous(Document* document) { ASSERT(isAnonymous()); m_node = document; }
 
-    // Add hit-test rects for the render tree rooted at this node to the provided collection on a
+    // Add hit-test rects for the layout tree rooted at this node to the provided collection on a
     // per-Layer basis.
     // currentLayer must be the enclosing layer, and layerOffset is the current offset within
-    // this layer. Subclass implementations will add any offset for this renderer within it's
+    // this layer. Subclass implementations will add any offset for this layoutObject within it's
     // container, so callers should provide only the offset of the container within it's layer.
     // containerRect is a rect that has already been added for the currentLayer which is likely to
     // be a container for child elements. Any rect wholly contained by containerRect can be
     // skipped.
     virtual void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const;
 
-    // Add hit-test rects for this renderer only to the provided list. layerOffset is the offset
-    // of this renderer within the current layer that should be used for each result.
+    // Add hit-test rects for this layoutObject only to the provided list. layerOffset is the offset
+    // of this layoutObject within the current layer that should be used for each result.
     virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const { };
 
     virtual PaintInvalidationReason paintInvalidationReason(const LayoutBoxModelObject& paintInvalidationContainer,
         const LayoutRect& oldPaintInvalidationRect, const LayoutPoint& oldPositionFromPaintInvalidationBacking,
         const LayoutRect& newPaintInvalidationRect, const LayoutPoint& newPositionFromPaintInvalidationBacking) const;
     virtual void incrementallyInvalidatePaint(const LayoutBoxModelObject& paintInvalidationContainer, const LayoutRect& oldBounds, const LayoutRect& newBounds, const LayoutPoint& positionFromPaintInvalidationBacking);
     void fullyInvalidatePaint(const LayoutBoxModelObject& paintInvalidationContainer, PaintInvalidationReason, const LayoutRect& oldBounds, const LayoutRect& newBounds);
 
     virtual bool hasNonCompositedScrollbars() const { return false; }
 
@@ skipping 48 matching lines @@
     Color selectionColor(int colorProperty) const;
 
     void removeShapeImageClient(ShapeValue*);
 
 #if ENABLE(ASSERT)
     void checkBlockPositionedObjectsNeedLayout();
 #endif
 
     bool isTextOrSVGChild() const { return isText() || (isSVG() && !isSVGRoot()); }
 
-    static bool isAllowedToModifyRenderTreeStructure(Document&);
+    static bool isAllowedToModifyLayoutTreeStructure(Document&);
 
     const LayoutBoxModelObject* invalidatePaintRectangleInternal(const LayoutRect&) const;
 
     RefPtr<ComputedStyle> m_style;
 
     // Oilpan: raw pointer back to the owning Node is considered safe.
     Node* m_node;
 
     LayoutObject* m_parent;
     LayoutObject* m_previous;
@@ skipping 157 matching lines @@
     void setChildNeedsOverflowRecalcAfterStyleChange(bool b) { m_bitfields.setChildNeedsOverflowRecalcAfterStyleChange(b); }
 
 private:
     // Store state between styleWillChange and styleDidChange
     static bool s_affectsParentBlock;
 
     // This stores the paint invalidation rect from the previous frame.
     LayoutRect m_previousPaintInvalidationRect;
 
     // This stores the position in the paint invalidation backing's coordinate.
-    // It is used to detect renderer shifts that forces a full invalidation.
+    // It is used to detect layoutObject shifts that forces a full invalidation.
     LayoutPoint m_previousPositionFromPaintInvalidationBacking;
 
     static unsigned s_instanceCount;
 };
 
-// FIXME: remove this once the render object lifecycle ASSERTS are no longer hit.
-class DeprecatedDisableModifyRenderTreeStructureAsserts {
-    WTF_MAKE_NONCOPYABLE(DeprecatedDisableModifyRenderTreeStructureAsserts);
+// FIXME: remove this once the layout object lifecycle ASSERTS are no longer hit.
+class DeprecatedDisableModifyLayoutTreeStructureAsserts {
+    WTF_MAKE_NONCOPYABLE(DeprecatedDisableModifyLayoutTreeStructureAsserts);
 public:
-    DeprecatedDisableModifyRenderTreeStructureAsserts();
+    DeprecatedDisableModifyLayoutTreeStructureAsserts();
 
-    static bool canModifyRenderTreeStateInAnyState();
+    static bool canModifyLayoutTreeStateInAnyState();
 
 private:
     TemporaryChange<bool> m_disabler;
 };
 
 // FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415
 // Remove this once we fix the bug.
 class DisablePaintInvalidationStateAsserts {
     WTF_MAKE_NONCOPYABLE(DisablePaintInvalidationStateAsserts);
 public:
@@ skipping 98 matching lines @@
 inline bool LayoutObject::preservesNewline() const
 {
     if (isSVGInlineText())
         return false;
 
     return style()->preserveNewline();
 }
 
 inline bool LayoutObject::layerCreationAllowedForSubtree() const
 {
-    LayoutObject* parentRenderer = parent();
-    while (parentRenderer) {
-        if (parentRenderer->isSVGHiddenContainer())
+    LayoutObject* parentLayoutObject = parent();
+    while (parentLayoutObject) {
+        if (parentLayoutObject->isSVGHiddenContainer())
             return false;
-        parentRenderer = parentRenderer->parent();
+        parentLayoutObject = parentLayoutObject->parent();
     }
 
     return true;
 }
 
 inline void LayoutObject::setSelectionStateIfNeeded(SelectionState state)
 {
     if (selectionState() == state)
         return;
 
@@ skipping 26 matching lines @@
     }
     return m_bitfields.boxDecorationBackgroundState() == HasBoxDecorationBackgroundKnownToBeObscured;
 }
 
 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRendering)
 {
     if (!has3DRendering)
         matrix.makeAffine();
 }
 
-inline int adjustForAbsoluteZoom(int value, LayoutObject* renderer)
+inline int adjustForAbsoluteZoom(int value, LayoutObject* layoutObject)
 {
-    return adjustForAbsoluteZoom(value, renderer->style());
+    return adjustForAbsoluteZoom(value, layoutObject->style());
 }
 
-inline double adjustDoubleForAbsoluteZoom(double value, LayoutObject& renderer)
+inline double adjustDoubleForAbsoluteZoom(double value, LayoutObject& layoutObject)
 {
-    ASSERT(renderer.style());
-    return adjustDoubleForAbsoluteZoom(value, *renderer.style());
+    ASSERT(layoutObject.style());
+    return adjustDoubleForAbsoluteZoom(value, *layoutObject.style());
 }
 
-inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, LayoutObject& renderer)
+inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, LayoutObject& layoutObject)
 {
-    ASSERT(renderer.style());
-    return adjustLayoutUnitForAbsoluteZoom(value, *renderer.style());
+    ASSERT(layoutObject.style());
+    return adjustLayoutUnitForAbsoluteZoom(value, *layoutObject.style());
 }
 
-inline void adjustFloatQuadForAbsoluteZoom(FloatQuad& quad, LayoutObject& renderer)
+inline void adjustFloatQuadForAbsoluteZoom(FloatQuad& quad, LayoutObject& layoutObject)
 {
-    float zoom = renderer.style()->effectiveZoom();
+    float zoom = layoutObject.style()->effectiveZoom();
     if (zoom != 1)
         quad.scale(1 / zoom, 1 / zoom);
 }
 
-inline void adjustFloatRectForAbsoluteZoom(FloatRect& rect, LayoutObject& renderer)
+inline void adjustFloatRectForAbsoluteZoom(FloatRect& rect, LayoutObject& layoutObject)
 {
-    float zoom = renderer.style()->effectiveZoom();
+    float zoom = layoutObject.style()->effectiveZoom();
     if (zoom != 1)
         rect.scale(1 / zoom, 1 / zoom);
 }
 
-inline double adjustScrollForAbsoluteZoom(double value, LayoutObject& renderer)
+inline double adjustScrollForAbsoluteZoom(double value, LayoutObject& layoutObject)
 {
-    ASSERT(renderer.style());
-    return adjustScrollForAbsoluteZoom(value, *renderer.style());
+    ASSERT(layoutObject.style());
+    return adjustScrollForAbsoluteZoom(value, *layoutObject.style());
 }
 
 #define DEFINE_LAYOUT_OBJECT_TYPE_CASTS(thisType, predicate) \
     DEFINE_TYPE_CASTS(thisType, LayoutObject, object, object->predicate, object.predicate)
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::LayoutObject*);
 void showLineTree(const blink::LayoutObject*);
 void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObject* object2);
 
 #endif
 
 #endif // LayoutObject_h