Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderInline.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
@@ skipping 18 matching lines @@
 #include "core/rendering/RenderLineBoxList.h"
 
 namespace blink {
 
 class RenderInline : public RenderBoxModelObject {
 public:
     explicit RenderInline(Element*);
 
     static RenderInline* createAnonymous(Document*);
 
-    RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
-    RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
+    LayoutObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
+    LayoutObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
 
     // If you have a RenderInline, use firstChild or lastChild instead.
     void slowFirstChild() const = delete;
     void slowLastChild() const = delete;
 
-    virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
+    virtual void addChild(LayoutObject* newChild, LayoutObject* beforeChild = 0) override;
 
     Element* node() const { return toElement(RenderBoxModelObject::node()); }
 
     virtual LayoutRectOutsets marginBoxOutsets() const override final;
     virtual LayoutUnit marginLeft() const override final;
     virtual LayoutUnit marginRight() const override final;
     virtual LayoutUnit marginTop() const override final;
     virtual LayoutUnit marginBottom() const override final;
     virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const override final;
     virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const override final;
     virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const override final;
     virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const override final;
 
     virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
     virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
 
-    virtual LayoutSize offsetFromContainer(const RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override final;
+    virtual LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override final;
 
     IntRect linesBoundingBox() const;
     LayoutRect linesVisualOverflowBoundingBox() const;
 
     InlineFlowBox* createAndAppendInlineFlowBox();
 
     void dirtyLineBoxes(bool fullLayout);
 
     RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
     const RenderLineBoxList* lineBoxes() const { return &m_lineBoxes; }
@@ skipping 26 matching lines @@
 protected:
     virtual void willBeDestroyed() override;
 
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
     virtual void computeSelfHitTestRects(Vector<LayoutRect>& rects, const LayoutPoint& layerOffset) const override;
 
     virtual void invalidateDisplayItemClients(DisplayItemList*) const override;
 
 private:
-    virtual RenderObjectChildList* virtualChildren() override final { return children(); }
-    virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
-    const RenderObjectChildList* children() const { return &m_children; }
-    RenderObjectChildList* children() { return &m_children; }
+    virtual LayoutObjectChildList* virtualChildren() override final { return children(); }
+    virtual const LayoutObjectChildList* virtualChildren() const override final { return children(); }
+    const LayoutObjectChildList* children() const { return &m_children; }
+    LayoutObjectChildList* children() { return &m_children; }
 
     virtual const char* renderName() const override;
 
     virtual bool isRenderInline() const override final { return true; }
 
     LayoutRect culledInlineVisualOverflowBoundingBox() const;
     InlineBox* culledInlineFirstLineBox() const;
     InlineBox* culledInlineLastLineBox() const;
 
     template<typename GeneratorContext>
     void generateLineBoxRects(GeneratorContext& yield) const;
     template<typename GeneratorContext>
     void generateCulledLineBoxRects(GeneratorContext& yield, const RenderInline* container) const;
 
-    void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild);
-    virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) override final;
+    void addChildToContinuation(LayoutObject* newChild, LayoutObject* beforeChild);
+    virtual void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObject* beforeChild = 0) override final;
 
-    void moveChildrenToIgnoringContinuation(RenderInline* to, RenderObject* startChild);
+    void moveChildrenToIgnoringContinuation(RenderInline* to, LayoutObject* startChild);
 
     void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock,
-                      RenderObject* beforeChild, RenderBoxModelObject* oldCont);
-    void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
-                   RenderObject* newChild, RenderBoxModelObject* oldCont);
+        LayoutObject* beforeChild, RenderBoxModelObject* oldCont);
+    void splitFlow(LayoutObject* beforeChild, RenderBlock* newBlockBox,
+        LayoutObject* newChild, RenderBoxModelObject* oldCont);
 
     virtual void layout() override final { ASSERT_NOT_REACHED(); } // Do nothing for layout()
 
     virtual void paint(const PaintInfo&, const LayoutPoint&) override final;
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
 
     virtual LayerType layerTypeRequired() const override { return isRelPositioned() || createsGroup() || hasClipPath() || style()->shouldCompositeForCurrentAnimations() ? NormalLayer : NoLayer; }
 
     virtual LayoutUnit offsetLeft() const override final;
@@ skipping 15 matching lines @@
     virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override final;
 
     virtual IntRect borderBoundingBox() const override final
     {
         IntRect boundingBox = linesBoundingBox();
         return IntRect(0, 0, boundingBox.width(), boundingBox.height());
     }
 
     virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby
 
-    virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
+    virtual void dirtyLinesFromChangedChild(LayoutObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
 
     virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override final;
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override final;
 
-    virtual void childBecameNonInline(RenderObject* child) override final;
+    virtual void childBecameNonInline(LayoutObject* child) override final;
 
     virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override final;
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override final;
 
     virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) override final;
 
     virtual void updateFromStyle() override final;
 
     RenderInline* clone() const;
 
-    RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
+    RenderBoxModelObject* continuationBefore(LayoutObject* beforeChild);
 
-    RenderObjectChildList m_children;
+    LayoutObjectChildList m_children;
     RenderLineBoxList m_lineBoxes;   // All of the line boxes created for this inline flow.  For example, <i>Hello<br>world.</i> will have two <i> line boxes.
 };
 
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
 
 } // namespace blink
 
 #endif // RenderInline_h