Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/LayoutBox.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007 Apple 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
-#ifndef RenderBox_h
-#define RenderBox_h
+#ifndef LayoutBox_h
+#define LayoutBox_h
 
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/shapes/ShapeOutsideInfo.h"
 #include "core/rendering/RenderOverflow.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/scroll/ScrollableArea.h"
 
 namespace blink {
 
 class LayoutMultiColumnSpannerPlaceholder;
 
 struct PaintInfo;
 
 enum SizeType { MainOrPreferredSize, MinSize, MaxSize };
 enum AvailableLogicalHeightType { ExcludeMarginBorderPadding, IncludeMarginBorderPadding };
 enum OverlayScrollbarSizeRelevancy { IgnoreOverlayScrollbarSize, IncludeOverlayScrollbarSize };
 enum MarginDirection { BlockDirection, InlineDirection };
 
 enum ShouldComputePreferred { ComputeActual, ComputePreferred };
 
 enum ScrollOffsetClamping {
     ScrollOffsetUnclamped,
     ScrollOffsetClamped
 };
 
-struct RenderBoxRareData {
-    WTF_MAKE_NONCOPYABLE(RenderBoxRareData); WTF_MAKE_FAST_ALLOCATED;
+struct LayoutBoxRareData {
+    WTF_MAKE_NONCOPYABLE(LayoutBoxRareData); WTF_MAKE_FAST_ALLOCATED;
 public:
-    RenderBoxRareData()
+    LayoutBoxRareData()
         : m_inlineBoxWrapper(0)
         , m_spannerPlaceholder(0)
         , m_overrideLogicalContentHeight(-1)
         , m_overrideLogicalContentWidth(-1)
         , m_previousBorderBoxSize(-1, -1)
     {
     }
 
     // For inline replaced elements, the inline box that owns us.
     InlineBox* m_inlineBoxWrapper;
 
     // For spanners, the spanner placeholder that lays us out within the multicol container.
     LayoutMultiColumnSpannerPlaceholder* m_spannerPlaceholder;
 
     LayoutUnit m_overrideLogicalContentHeight;
     LayoutUnit m_overrideLogicalContentWidth;
 
-    // Set by RenderBox::updatePreviousBorderBoxSizeIfNeeded().
+    // Set by LayoutBox::updatePreviousBorderBoxSizeIfNeeded().
     LayoutSize m_previousBorderBoxSize;
 };
 
-class RenderBox : public LayoutBoxModelObject {
+class LayoutBox : public LayoutBoxModelObject {
 public:
-    explicit RenderBox(ContainerNode*);
+    explicit LayoutBox(ContainerNode*);
 
     virtual LayerType layerTypeRequired() const override;
 
     virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const override;
 
     virtual bool backgroundShouldAlwaysBeClipped() const { return false; }
 
     // Use this with caution! No type checking is done!
-    RenderBox* firstChildBox() const;
-    RenderBox* lastChildBox() const;
+    LayoutBox* firstChildBox() const;
+    LayoutBox* lastChildBox() const;
 
     int pixelSnappedWidth() const { return m_frameRect.pixelSnappedWidth(); }
     int pixelSnappedHeight() const { return m_frameRect.pixelSnappedHeight(); }
 
     void setX(LayoutUnit x) { m_frameRect.setX(x); }
     void setY(LayoutUnit y) { m_frameRect.setY(y); }
     void setWidth(LayoutUnit width) { m_frameRect.setWidth(width); }
     void setHeight(LayoutUnit height) { m_frameRect.setHeight(height); }
 
     LayoutUnit logicalLeft() const { return style()->isHorizontalWritingMode() ? m_frameRect.x() : m_frameRect.y(); }
@@ skipping 74 matching lines @@
     // The content box converted to absolute coords (taking transforms into account).
     FloatQuad absoluteContentQuad() const;
 
     // This returns the content area of the box (excluding padding and border). The only difference with contentBoxRect is that computedCSSContentBoxRect
     // does include the intrinsic padding in the content box as this is what some callers expect (like getComputedStyle).
     LayoutRect computedCSSContentBoxRect() const { return LayoutRect(borderLeft() + computedCSSPaddingLeft(), borderTop() + computedCSSPaddingTop(), clientWidth() - computedCSSPaddingLeft() - computedCSSPaddingRight(), clientHeight() - computedCSSPaddingTop() - computedCSSPaddingBottom()); }
 
     virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset) const override;
 
     // Use this with caution! No type checking is done!
-    RenderBox* previousSiblingBox() const;
-    RenderBox* previousInFlowSiblingBox() const;
-    RenderBox* nextSiblingBox() const;
-    RenderBox* nextInFlowSiblingBox() const;
-    RenderBox* parentBox() const;
+    LayoutBox* previousSiblingBox() const;
+    LayoutBox* previousInFlowSiblingBox() const;
+    LayoutBox* nextSiblingBox() const;
+    LayoutBox* nextInFlowSiblingBox() const;
+    LayoutBox* parentBox() const;
 
     // Return the previous sibling column set or spanner placeholder. Only to be used on multicol container children.
-    RenderBox* previousSiblingMultiColumnBox() const;
+    LayoutBox* previousSiblingMultiColumnBox() const;
     // Return the next sibling column set or spanner placeholder. Only to be used on multicol container children.
-    RenderBox* nextSiblingMultiColumnBox() const;
+    LayoutBox* nextSiblingMultiColumnBox() const;
 
     bool canResize() const;
 
     // Visual and layout overflow are in the coordinate space of the box.  This means that they aren't purely physical directions.
     // For horizontal-tb and vertical-lr they will match physical directions, but for horizontal-bt and vertical-rl, the top/bottom and left/right
     // respectively are flipped when compared to their physical counterparts.  For example minX is on the left in vertical-lr,
     // but it is on the right in vertical-rl.
     LayoutRect noOverflowRect() const;
     LayoutRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : noOverflowRect(); }
     IntRect pixelSnappedLayoutOverflowRect() const { return pixelSnappedIntRect(layoutOverflowRect()); }
     LayoutSize maxLayoutOverflow() const { return LayoutSize(layoutOverflowRect().maxX(), layoutOverflowRect().maxY()); }
     LayoutUnit logicalLeftLayoutOverflow() const { return style()->isHorizontalWritingMode() ? layoutOverflowRect().x() : layoutOverflowRect().y(); }
     LayoutUnit logicalRightLayoutOverflow() const { return style()->isHorizontalWritingMode() ? layoutOverflowRect().maxX() : layoutOverflowRect().maxY(); }
 
     virtual LayoutRect visualOverflowRect() const { return m_overflow ? m_overflow->visualOverflowRect() : borderBoxRect(); }
     LayoutUnit logicalLeftVisualOverflow() const { return style()->isHorizontalWritingMode() ? visualOverflowRect().x() : visualOverflowRect().y(); }
     LayoutUnit logicalRightVisualOverflow() const { return style()->isHorizontalWritingMode() ? visualOverflowRect().maxX() : visualOverflowRect().maxY(); }
 
     LayoutRect contentsVisualOverflowRect() const { return m_overflow ? m_overflow->contentsVisualOverflowRect() : LayoutRect(); }
 
     void addLayoutOverflow(const LayoutRect&);
     void addVisualOverflow(const LayoutRect&);
 
     // Clipped by the contents clip, if one exists.
     void addContentsVisualOverflow(const LayoutRect&);
 
     void addVisualEffectOverflow();
     LayoutRectOutsets computeVisualEffectOverflowOutsets() const;
-    void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, child->locationOffset()); }
-    void addOverflowFromChild(RenderBox* child, const LayoutSize& delta);
+    void addOverflowFromChild(LayoutBox* child) { addOverflowFromChild(child, child->locationOffset()); }
+    void addOverflowFromChild(LayoutBox* child, const LayoutSize& delta);
     void clearLayoutOverflow();
     void clearAllOverflows() { m_overflow.clear(); }
 
     void updateLayerTransformAfterLayout();
 
     LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); }
     LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); }
     LayoutSize contentSize() const { return LayoutSize(contentWidth(), contentHeight()); }
     LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWritingMode() ? contentWidth() : contentHeight(); }
     LayoutUnit contentLogicalHeight() const { return style()->isHorizontalWritingMode() ? contentHeight() : contentWidth(); }
@@ skipping 95 matching lines @@
     LayoutRect reflectedRect(const LayoutRect&) const;
 
     virtual void layout() override;
     virtual void paint(const PaintInfo&, const LayoutPoint&) override;
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
 
     virtual LayoutUnit minPreferredLogicalWidth() const override;
     virtual LayoutUnit maxPreferredLogicalWidth() const override;
 
     // FIXME: We should rename these back to overrideLogicalHeight/Width and have them store
-    // the border-box height/width like the regular height/width accessors on RenderBox.
+    // the border-box height/width like the regular height/width accessors on LayoutBox.
     // Right now, these are different than contentHeight/contentWidth because they still
     // include the scrollbar height/width.
     LayoutUnit overrideLogicalContentWidth() const;
     LayoutUnit overrideLogicalContentHeight() const;
     bool hasOverrideHeight() const;
     bool hasOverrideWidth() const;
     void setOverrideLogicalContentHeight(LayoutUnit);
     void setOverrideLogicalContentWidth(LayoutUnit);
     void clearOverrideSize();
     void clearOverrideLogicalContentHeight();
@@ skipping 127 matching lines @@
     int horizontalScrollbarHeight() const;
     int intrinsicScrollbarLogicalWidth() const;
     int scrollbarLogicalWidth() const { return style()->isHorizontalWritingMode() ? verticalScrollbarWidth() : horizontalScrollbarHeight(); }
     int scrollbarLogicalHeight() const { return style()->isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
     virtual bool scroll(ScrollDirection, ScrollGranularity, float delta = 1);
     bool canBeScrolledAndHasScrollableArea() const;
     virtual bool canBeProgramaticallyScrolled() const;
     virtual void autoscroll(const IntPoint&);
     bool canAutoscroll() const;
     IntSize calculateAutoscrollDirection(const IntPoint& windowPoint) const;
-    static RenderBox* findAutoscrollable(LayoutObject*);
+    static LayoutBox* findAutoscrollable(LayoutObject*);
     virtual void stopAutoscroll() { }
     virtual void panScroll(const IntPoint&);
 
     bool hasAutoVerticalScrollbar() const { return hasOverflowClip() && (style()->overflowY() == OAUTO || style()->overflowY() == OPAGEDY || style()->overflowY() == OOVERLAY); }
     bool hasAutoHorizontalScrollbar() const { return hasOverflowClip() && (style()->overflowX() == OAUTO || style()->overflowX() == OOVERLAY); }
     bool scrollsOverflow() const { return scrollsOverflowX() || scrollsOverflowY(); }
 
     bool hasScrollableOverflowX() const { return scrollsOverflowX() && pixelSnappedScrollWidth() != pixelSnappedClientWidth(); }
     bool hasScrollableOverflowY() const { return scrollsOverflowY() && pixelSnappedScrollHeight() != pixelSnappedClientHeight(); }
     virtual bool scrollsOverflowX() const { return hasOverflowClip() && (style()->overflowX() == OSCROLL || hasAutoHorizontalScrollbar()); }
@@ skipping 42 matching lines @@
     bool isFlexItemIncludingDeprecated() const { return !isInline() && !isFloatingOrOutOfFlowPositioned() && parent() && parent()->isFlexibleBoxIncludingDeprecated(); }
 
     bool isGridItem() const { return parent() && parent()->isRenderGrid(); }
 
     virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
 
     virtual LayoutUnit offsetLeft() const override;
     virtual LayoutUnit offsetTop() const override;
 
-    LayoutPoint flipForWritingModeForChild(const RenderBox* child, const LayoutPoint&) const;
+    LayoutPoint flipForWritingModeForChild(const LayoutBox* child, const LayoutPoint&) const;
     LayoutUnit flipForWritingMode(LayoutUnit position) const WARN_UNUSED_RETURN
     {
         // The offset is in the block direction (y for horizontal writing modes, x for vertical writing modes).
         if (!UNLIKELY(hasFlippedBlocksWritingMode()))
             return position;
         return logicalHeight() - position;
     }
     LayoutPoint flipForWritingMode(const LayoutPoint& position) const WARN_UNUSED_RETURN
     {
         if (!UNLIKELY(hasFlippedBlocksWritingMode()))
@@ skipping 65 matching lines @@
     bool hasVerticalLayoutOverflow() const
     {
         if (!m_overflow)
             return false;
 
         LayoutRect layoutOverflowRect = m_overflow->layoutOverflowRect();
         LayoutRect noOverflowRect = this->noOverflowRect();
         return layoutOverflowRect.y() < noOverflowRect.y() || layoutOverflowRect.maxY() > noOverflowRect.maxY();
     }
 
-    virtual RenderBox* createAnonymousBoxWithSameTypeAs(const LayoutObject*) const
+    virtual LayoutBox* createAnonymousBoxWithSameTypeAs(const LayoutObject*) const
     {
         ASSERT_NOT_REACHED();
         return 0;
     }
 
-    bool hasSameDirectionAs(const RenderBox* object) const { return style()->direction() == object->style()->direction(); }
+    bool hasSameDirectionAs(const LayoutBox* object) const { return style()->direction() == object->style()->direction(); }
 
     ShapeOutsideInfo* shapeOutsideInfo() const
     {
         return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : 0;
     }
 
     void markShapeOutsideDependentsForLayout()
     {
         if (isFloating())
             removeFloatingOrPositionedChildFromBlockLists();
     }
 
     bool backgroundHasOpaqueTopLayer() const;
 
     void setIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalHeight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
 protected:
     virtual void willBeDestroyed() override;
 
     virtual void styleWillChange(StyleDifference, const LayoutStyle& newStyle) override;
     virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) override;
     virtual void updateFromStyle() override;
 
     // Returns false if it could not cheaply compute the extent (e.g. fixed background), in which case the returned rect may be incorrect.
-    // FIXME: make this a const method once the RenderBox reference in BoxPainter is const.
+    // FIXME: make this a const method once the LayoutBox reference in BoxPainter is const.
     bool getBackgroundPaintedExtent(LayoutRect&);
     virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const;
     virtual bool computeBackgroundIsKnownToBeObscured() override;
 
     void computePositionedLogicalWidth(LogicalExtentComputedValues&) const;
 
     LayoutUnit computeIntrinsicLogicalWidthUsing(const Length& logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
     LayoutUnit computeIntrinsicLogicalContentHeightUsing(const Length& logicalHeightLength, LayoutUnit intrinsicContentHeight, LayoutUnit borderAndPadding) const;
 
     virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
@@ skipping 26 matching lines @@
 
     void updateShapeOutsideInfoAfterStyleChange(const LayoutStyle&, const LayoutStyle* oldStyle);
     void updateGridPositionAfterStyleChange(const LayoutStyle*);
 
     bool autoWidthShouldFitContent() const;
     LayoutUnit shrinkToFitLogicalWidth(LayoutUnit availableLogicalWidth, LayoutUnit bordersPlusPadding) const;
 
     // Returns true if we queued up a paint invalidation.
     bool paintInvalidationLayerRectsForImage(WrappedImagePtr, const FillLayer&, bool drawingBackground);
 
-    bool skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock) const;
+    bool skipContainingBlockForPercentHeightCalculation(const LayoutBox* containingBlock) const;
 
     LayoutUnit containingBlockLogicalWidthForPositioned(const LayoutBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const;
     LayoutUnit containingBlockLogicalHeightForPositioned(const LayoutBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const;
 
     void computePositionedLogicalHeight(LogicalExtentComputedValues&) const;
     void computePositionedLogicalWidthUsing(Length logicalWidth, const LayoutBoxModelObject* containerBlock, TextDirection containerDirection,
-                                            LayoutUnit containerLogicalWidth, LayoutUnit bordersPlusPadding,
-                                            const Length& logicalLeft, const Length& logicalRight, const Length& marginLogicalLeft,
-                                            const Length& marginLogicalRight, LogicalExtentComputedValues&) const;
+        LayoutUnit containerLogicalWidth, LayoutUnit bordersPlusPadding,
+        const Length& logicalLeft, const Length& logicalRight, const Length& marginLogicalLeft,
+        const Length& marginLogicalRight, LogicalExtentComputedValues&) const;
     void computePositionedLogicalHeightUsing(Length logicalHeightLength, const LayoutBoxModelObject* containerBlock,
-                                             LayoutUnit containerLogicalHeight, LayoutUnit bordersPlusPadding, LayoutUnit logicalHeight,
-                                             const Length& logicalTop, const Length& logicalBottom, const Length& marginLogicalTop,
-                                             const Length& marginLogicalBottom, LogicalExtentComputedValues&) const;
+        LayoutUnit containerLogicalHeight, LayoutUnit bordersPlusPadding, LayoutUnit logicalHeight,
+        const Length& logicalTop, const Length& logicalBottom, const Length& marginLogicalTop,
+        const Length& marginLogicalBottom, LogicalExtentComputedValues&) const;
 
     void computePositionedLogicalHeightReplaced(LogicalExtentComputedValues&) const;
     void computePositionedLogicalWidthReplaced(LogicalExtentComputedValues&) const;
 
     LayoutUnit fillAvailableMeasure(LayoutUnit availableLogicalWidth) const;
     LayoutUnit fillAvailableMeasure(LayoutUnit availableLogicalWidth, LayoutUnit& marginStart, LayoutUnit& marginEnd) const;
 
     virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const;
 
     // This function calculates the minimum and maximum preferred widths for an object.
     // These values are used in shrink-to-fit layout systems.
     // These include tables, positioned objects, floats and flexible boxes.
     virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDirty(); }
 
-    RenderBoxRareData& ensureRareData()
+    LayoutBoxRareData& ensureRareData()
     {
         if (!m_rareData)
-            m_rareData = adoptPtr(new RenderBoxRareData());
+            m_rareData = adoptPtr(new LayoutBoxRareData());
         return *m_rareData.get();
     }
 
     void savePreviousBorderBoxSizeIfNeeded();
     LayoutSize computePreviousBorderBoxSize(const LayoutSize& previousBoundsSize) const;
 
     bool logicalHeightComputesAsNone(SizeType) const;
 
     bool isBox() const = delete; // This will catch anyone doing an unnecessary check.
 
@@ skipping 13 matching lines @@
     // The preferred logical width of the element if it were to break its lines at every possible opportunity.
     LayoutUnit m_minPreferredLogicalWidth;
 
     // The preferred logical width of the element if it never breaks any lines at all.
     LayoutUnit m_maxPreferredLogicalWidth;
 
     // Our overflow information.
     OwnPtr<RenderOverflow> m_overflow;
 
 private:
-    OwnPtr<RenderBoxRareData> m_rareData;
+    OwnPtr<LayoutBoxRareData> m_rareData;
 };
 
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderBox, isBox());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBox, isBox());
 
-inline RenderBox* RenderBox::previousSiblingBox() const
+inline LayoutBox* LayoutBox::previousSiblingBox() const
 {
-    return toRenderBox(previousSibling());
+    return toLayoutBox(previousSibling());
 }
 
-inline RenderBox* RenderBox::previousInFlowSiblingBox() const
+inline LayoutBox* LayoutBox::previousInFlowSiblingBox() const
 {
-    RenderBox* previous = previousSiblingBox();
+    LayoutBox* previous = previousSiblingBox();
     while (previous && previous->isOutOfFlowPositioned())
         previous = previous->previousSiblingBox();
     return previous;
 }
 
-inline RenderBox* RenderBox::nextSiblingBox() const
+inline LayoutBox* LayoutBox::nextSiblingBox() const
 {
-    return toRenderBox(nextSibling());
+    return toLayoutBox(nextSibling());
 }
 
-inline RenderBox* RenderBox::nextInFlowSiblingBox() const
+inline LayoutBox* LayoutBox::nextInFlowSiblingBox() const
 {
-    RenderBox* next = nextSiblingBox();
+    LayoutBox* next = nextSiblingBox();
     while (next && next->isOutOfFlowPositioned())
         next = next->nextSiblingBox();
     return next;
 }
 
-inline RenderBox* RenderBox::parentBox() const
+inline LayoutBox* LayoutBox::parentBox() const
 {
-    return toRenderBox(parent());
+    return toLayoutBox(parent());
 }
 
-inline RenderBox* RenderBox::firstChildBox() const
+inline LayoutBox* LayoutBox::firstChildBox() const
 {
-    return toRenderBox(slowFirstChild());
+    return toLayoutBox(slowFirstChild());
 }
 
-inline RenderBox* RenderBox::lastChildBox() const
+inline LayoutBox* LayoutBox::lastChildBox() const
 {
-    return toRenderBox(slowLastChild());
+    return toLayoutBox(slowLastChild());
 }
 
-inline RenderBox* RenderBox::previousSiblingMultiColumnBox() const
+inline LayoutBox* LayoutBox::previousSiblingMultiColumnBox() const
 {
     ASSERT(isLayoutMultiColumnSpannerPlaceholder() || isLayoutMultiColumnSet());
-    RenderBox* previousBox = previousSiblingBox();
+    LayoutBox* previousBox = previousSiblingBox();
     if (previousBox->isLayoutFlowThread())
         return 0;
     return previousBox;
 }
 
-inline RenderBox* RenderBox::nextSiblingMultiColumnBox() const
+inline LayoutBox* LayoutBox::nextSiblingMultiColumnBox() const
 {
     ASSERT(isLayoutMultiColumnSpannerPlaceholder() || isLayoutMultiColumnSet());
     return nextSiblingBox();
 }
 
-inline void RenderBox::setInlineBoxWrapper(InlineBox* boxWrapper)
+inline void LayoutBox::setInlineBoxWrapper(InlineBox* boxWrapper)
 {
     if (boxWrapper) {
         ASSERT(!inlineBoxWrapper());
         // m_inlineBoxWrapper should already be 0. Deleting it is a safeguard against security issues.
         // Otherwise, there will two line box wrappers keeping the reference to this renderer, and
         // only one will be notified when the renderer is getting destroyed. The second line box wrapper
         // will keep a stale reference.
         if (UNLIKELY(inlineBoxWrapper() != 0))
             deleteLineBoxWrapper();
     }
 
     ensureRareData().m_inlineBoxWrapper = boxWrapper;
 }
 
 } // namespace blink
 
-#endif // RenderBox_h
+#endif // LayoutBox_h