Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/LayoutState.h

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "core/rendering/ColumnInfo.h"
 #include "platform/geometry/LayoutRect.h"
 #include "wtf/HashMap.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
 class ForceHorriblySlowRectMapping;
 class RenderBox;
 class RenderFlowThread;
-class RenderObject;
+class LayoutObject;
 class RenderView;
 
 class LayoutState {
     WTF_MAKE_NONCOPYABLE(LayoutState);
 public:
     // Constructor for root LayoutState created by RenderView
     LayoutState(LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged, RenderView&);
     // Constructor for sub-tree layout
-    explicit LayoutState(RenderObject& root);
+    explicit LayoutState(LayoutObject& root);
 
     LayoutState(RenderBox&, const LayoutSize& offset, LayoutUnit pageLogicalHeight = 0, bool pageHeightLogicalChanged = false, ColumnInfo* = 0, bool containingBlockLogicalWidthChanged = false);
 
     ~LayoutState();
 
     void clearPaginationInformation();
     bool isPaginatingColumns() const { return m_columnInfo; }
     bool isPaginated() const { return m_isPaginated; }
 
     // The page logical offset is the object's offset from the top of the page in the page progression
@@ skipping 11 matching lines @@
     bool containingBlockLogicalWidthChanged() const { return m_containingBlockLogicalWidthChanged; }
 
     LayoutState* next() const { return m_next; }
 
     bool needsBlockDirectionLocationSetBeforeLayout() const { return m_isPaginated && m_pageLogicalHeight; }
 
     RenderFlowThread* flowThread() const { return m_flowThread; }
 
     ColumnInfo* columnInfo() const { return m_columnInfo; }
 
-    RenderObject& renderer() const { return m_renderer; }
+    LayoutObject& renderer() const { return m_renderer; }
 
 private:
     friend class ForceHorriblySlowRectMapping;
 
     // Do not add anything apart from bitfields until after m_columnInfo. See https://bugs.webkit.org/show_bug.cgi?id=100173
     bool m_isPaginated : 1;
     // If our page height has changed, this will force all blocks to relayout.
     bool m_pageLogicalHeightChanged : 1;
     bool m_containingBlockLogicalWidthChanged : 1;
 
     RenderFlowThread* m_flowThread;
 
     // If the enclosing pagination model is a column model, then this will store column information for easy retrieval/manipulation.
     ColumnInfo* m_columnInfo;
     LayoutState* m_next;
 
     // x/y offset from container. Does not include relative positioning or scroll offsets.
     LayoutSize m_layoutOffset;
 
     // The current page height for the pagination model that encloses us.
     LayoutUnit m_pageLogicalHeight;
     // The offset of the start of the first page in the nearest enclosing pagination model.
     LayoutSize m_pageOffset;
 
-    RenderObject& m_renderer;
+    LayoutObject& m_renderer;
 };
 
 } // namespace blink
 
 #endif // LayoutState_h