Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderView.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * 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,
@@ skipping 37 matching lines @@
     void willBeDestroyed() override;
 
     bool hitTest(const HitTestRequest&, HitTestResult&);
     bool hitTest(const HitTestRequest&, const HitTestLocation&, HitTestResult&);
 
     // Returns the total count of calls to HitTest, for testing.
     unsigned hitTestCount() const { return m_hitTestCount; }
 
     virtual const char* renderName() const override { return "RenderView"; }
 
-    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderView || RenderBlockFlow::isOfType(type); }
+    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderView || RenderBlockFlow::isOfType(type); }
 
     virtual LayerType layerTypeRequired() const override { return NormalLayer; }
 
-    virtual bool isChildAllowed(RenderObject*, const RenderStyle&) const override;
+    virtual bool isChildAllowed(LayoutObject*, const RenderStyle&) const override;
 
     virtual void layout() override;
     virtual void updateLogicalWidth() override;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
 
     virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const override;
 
     // The same as the FrameView's layoutHeight/layoutWidth but with null check guards.
     int viewHeight(IncludeScrollbarsInRect = ExcludeScrollbars) const;
     int viewWidth(IncludeScrollbarsInRect = ExcludeScrollbars) const;
@@ skipping 19 matching lines @@
     void adjustViewportConstrainedOffset(LayoutRect&, ViewportConstrainedPosition) const;
 
     void invalidatePaintForRectangle(const LayoutRect&, PaintInvalidationReason) const;
 
     void invalidatePaintForViewAndCompositedLayers();
 
     virtual void paint(const PaintInfo&, const LayoutPoint&) override;
     virtual void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) override;
 
     enum SelectionPaintInvalidationMode { PaintInvalidationNewXOROld, PaintInvalidationNewMinusOld };
-    void setSelection(RenderObject* start, int startPos, RenderObject*, int endPos, SelectionPaintInvalidationMode = PaintInvalidationNewXOROld);
+    void setSelection(LayoutObject* start, int startPos, LayoutObject*, int endPos, SelectionPaintInvalidationMode = PaintInvalidationNewXOROld);
     void clearSelection();
     void setSelection(const FrameSelection&);
     bool hasPendingSelection() const { return m_pendingSelection.m_hasPendingSelection; }
     void commitPendingSelection();
-    RenderObject* selectionStart();
-    RenderObject* selectionEnd();
+    LayoutObject* selectionStart();
+    LayoutObject* selectionEnd();
     IntRect selectionBounds();
     void selectionStartEnd(int& startPos, int& endPos);
     void invalidatePaintForSelection();
 
     virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override;
     virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
 
     virtual LayoutRect viewRect() const override;
 
     bool shouldDoFullPaintInvalidationForNextLayout() const;
@@ skipping 44 matching lines @@
 
     double layoutViewportWidth() const;
     double layoutViewportHeight() const;
 
     void pushLayoutState(LayoutState& layoutState) { m_layoutState = &layoutState; }
     void popLayoutState() { ASSERT(m_layoutState); m_layoutState = m_layoutState->next(); }
     virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override final;
 
 private:
     virtual void mapLocalToContainer(const LayoutLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override;
-    virtual const RenderObject* pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
+    virtual const LayoutObject* pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
     virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
     virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
 
     void layoutContent();
 #if ENABLE(ASSERT)
     void checkLayoutState();
 #endif
 
     friend class ForceHorriblySlowRectMapping;
 
     bool shouldUsePrintingLayout() const;
 
-    RenderObject* backgroundRenderer() const;
+    LayoutObject* backgroundRenderer() const;
 
     virtual void invalidateDisplayItemClients(DisplayItemList*) const override;
 
     FrameView* m_frameView;
 
-    RenderObject* m_selectionStart;
-    RenderObject* m_selectionEnd;
+    LayoutObject* m_selectionStart;
+    LayoutObject* m_selectionEnd;
 
     int m_selectionStartPos;
     int m_selectionEndPos;
 
     LayoutUnit m_pageLogicalHeight;
     bool m_pageLogicalHeightChanged;
     LayoutState* m_layoutState;
     OwnPtr<LayerCompositor> m_compositor;
     RefPtr<IntervalArena> m_intervalArena;
 
@@ skipping 18 matching lines @@
 
         Position m_start;
         Position m_end;
         Position m_extent;
         EAffinity m_affinity;
         bool m_hasPendingSelection : 1;
         bool m_shouldShowBlockCursor : 1;
     } m_pendingSelection;
 };
 
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderView, isRenderView());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderView, isRenderView());
 
 // Suspends the LayoutState cached offset and clipRect optimization. Used under transforms
 // that cannot be represented by LayoutState (common in SVG) and when manipulating the render
 // tree during layout in ways that can trigger paint invalidation of a non-child (e.g. when a list item
 // moves its list marker around). Note that even when disabled, LayoutState is still used to
 // store layoutDelta.
 class ForceHorriblySlowRectMapping {
     WTF_MAKE_NONCOPYABLE(ForceHorriblySlowRectMapping);
 public:
     ForceHorriblySlowRectMapping(const PaintInvalidationState* paintInvalidationState)
@@ skipping 10 matching lines @@
             m_paintInvalidationState->m_cachedOffsetsEnabled = true;
     }
 private:
     const PaintInvalidationState* m_paintInvalidationState;
     bool m_didDisable;
 };
 
 } // namespace blink
 
 #endif // RenderView_h