Move rendering/RenderBox to layout/LayoutBox.

Source/core/paint/GridPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/GridPainter.h"
 
 #include "core/layout/PaintInfo.h"
 #include "core/paint/BlockPainter.h"
 #include "core/rendering/RenderGrid.h"
@@ skipping 11 matching lines @@
 
     size_t endGridAreaIndex = std::upper_bound(coordinates.begin() + startGridAreaIndex, coordinates.end() - 1, end) - coordinates.begin();
     if (endGridAreaIndex > 0)
         --endGridAreaIndex;
 
     return GridSpan(startGridAreaIndex, endGridAreaIndex);
 }
 
 class GridItemsSorter {
 public:
-    bool operator()(const std::pair<RenderBox*, size_t>& firstChild, const std::pair<RenderBox*, size_t>& secondChild) const
+    bool operator()(const std::pair<LayoutBox*, size_t>& firstChild, const std::pair<LayoutBox*, size_t>& secondChild) const
     {
         if (firstChild.first->style()->order() != secondChild.first->style()->order())
             return firstChild.first->style()->order() < secondChild.first->style()->order();
 
         return firstChild.second < secondChild.second;
     }
 };
 
 void GridPainter::paintChildren(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     ASSERT(!m_renderGrid.needsLayout());
     ASSERT_WITH_SECURITY_IMPLICATION(!m_renderGrid.gridIsDirty());
 
     LayoutRect localPaintInvalidationRect = paintInfo.rect;
     localPaintInvalidationRect.moveBy(-paintOffset);
 
     GridSpan dirtiedColumns = dirtiedGridAreas(m_renderGrid.columnPositions(), localPaintInvalidationRect.x(), localPaintInvalidationRect.maxX());
     GridSpan dirtiedRows = dirtiedGridAreas(m_renderGrid.rowPositions(), localPaintInvalidationRect.y(), localPaintInvalidationRect.maxY());
 
-    Vector<std::pair<RenderBox*, size_t> > gridItemsToBePainted;
+    Vector<std::pair<LayoutBox*, size_t>> gridItemsToBePainted;
 
     for (GridSpan::iterator row = dirtiedRows.begin(); row != dirtiedRows.end(); ++row) {
         for (GridSpan::iterator column = dirtiedColumns.begin(); column != dirtiedColumns.end(); ++column) {
-            const Vector<RenderBox*, 1>& children = m_renderGrid.gridCell(row.toInt(), column.toInt());
+            const Vector<LayoutBox*, 1>& children = m_renderGrid.gridCell(row.toInt(), column.toInt());
             for (auto* child : children)
                 gridItemsToBePainted.append(std::make_pair(child, m_renderGrid.paintIndexForGridItem(child)));
         }
     }
 
     for (auto* item: m_renderGrid.itemsOverflowingGridArea()) {
         if (item->frameRect().intersects(localPaintInvalidationRect))
             gridItemsToBePainted.append(std::make_pair(item, m_renderGrid.paintIndexForGridItem(item)));
     }
 
     // Sort grid items following order-modified document order.
     // See http://www.w3.org/TR/css-flexbox/#order-modified-document-order
     std::stable_sort(gridItemsToBePainted.begin(), gridItemsToBePainted.end(), GridItemsSorter());
 
-    RenderBox* previous = 0;
+    LayoutBox* previous = 0;
     for (const auto& gridItemAndPaintIndex : gridItemsToBePainted) {
         // We might have duplicates because of spanning children are included in all cells they span.
         // Skip them here to avoid painting items several times.
-        RenderBox* current = gridItemAndPaintIndex.first;
+        LayoutBox* current = gridItemAndPaintIndex.first;
         if (current == previous)
             continue;
 
         BlockPainter(m_renderGrid).paintChild(*current, paintInfo, paintOffset);
         previous = current;
     }
 }
 
 } // namespace blink