[CSS Grid Layout] RenderGrid::growGrid refactoring

Source/core/rendering/RenderGrid.cpp

 /*
  * Copyright (C) 2011 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 710 matching lines @@
     for (size_t i = 0; i < tracks.size(); ++i) {
         const GridTrackSize& trackSize = gridTrackSize(direction, i);
         const GridLength& minTrackBreadth = trackSize.minTrackBreadth();
         if (computeUsedBreadthOfMinLength(direction, minTrackBreadth) > tracks[i].m_usedBreadth)
             return false;
     }
     return true;
 }
 #endif
 
-void RenderGrid::growGrid(GridTrackSizingDirection direction, size_t maximumPositionIndex)
+void RenderGrid::growGrid(size_t maximumRowIndex, size_t maximumColumnIndex)

[Julien - ping for review, 2014/06/10 00:13:00]

I think the name "growGrid" is not appropriate anymore as we may not do
anything. The old code would always grow (due to the ASSERT).

A better name would be ensureGridSize or ensureGridCanContain

[Manuel Rego, 2014/06/10 10:25:55]

Yes, I agree. Updated the name.

 {
-    if (direction == ForColumns) {
-        ASSERT(maximumPositionIndex >= gridColumnCount());
-        for (size_t row = 0; row < gridRowCount(); ++row)
-            m_grid[row].grow(maximumPositionIndex + 1);
-    } else {
-        ASSERT(maximumPositionIndex >= gridRowCount());
-        const size_t oldRowSize = gridRowCount();
-        m_grid.grow(maximumPositionIndex + 1);
+    const size_t oldRowSize = gridRowCount();
+    if (maximumRowIndex >= oldRowSize) {
+        m_grid.grow(maximumRowIndex + 1);
         for (size_t row = oldRowSize; row < gridRowCount(); ++row)
             m_grid[row].grow(gridColumnCount());
     }
+
+    if (maximumColumnIndex >= gridColumnCount()) {
+        for (size_t row = 0; row < gridRowCount(); ++row)
+            m_grid[row].grow(maximumColumnIndex + 1);
+    }
 }
 
 void RenderGrid::insertItemIntoGrid(RenderBox* child, const GridCoordinate& coordinate)
 {
     // Ensure that the grid is big enough to contain new grid item.
-    if (gridRowCount() <= coordinate.rows.resolvedFinalPosition.toInt())
-        growGrid(ForRows, coordinate.rows.resolvedFinalPosition.toInt());
-    if (gridColumnCount() <= coordinate.columns.resolvedFinalPosition.toInt())
-        growGrid(ForColumns, coordinate.columns.resolvedFinalPosition.toInt());
+    growGrid(coordinate.rows.resolvedFinalPosition.toInt(), coordinate.columns.resolvedFinalPosition.toInt());
 
     for (GridSpan::iterator row = coordinate.rows.begin(); row != coordinate.rows.end(); ++row) {
         for (GridSpan::iterator column = coordinate.columns.begin(); column != coordinate.columns.end(); ++column)
             m_grid[row.toInt()][column.toInt()].append(child);
     }
 
     m_gridItemCoordinate.set(child, coordinate);
 }
 
 void RenderGrid::placeItemsOnGrid()
@@ skipping 496 matching lines @@
     if (isOutOfFlowPositioned())
         return "RenderGrid (positioned)";
     if (isAnonymous())
         return "RenderGrid (generated)";
     if (isRelPositioned())
         return "RenderGrid (relative positioned)";
     return "RenderGrid";
 }
 
 } // namespace WebCore