Revert of [css-grid] Remove a duplicated auto repeat computation for intrinsic sizes (patchset #4 i…

third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index cb52b7acaa913ca94f88f90c69cc728421147d4e..9c3e7d8f9da0f02cf6ac9197786fef40db66bf7b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -510,8 +510,14 @@ void LayoutGrid::layoutBlock(bool relayoutChildren) {
 
     TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope);
 
-    updateAutoRepeatTracksAndSetDirtyIfNeeded(TrackSizing);
-    placeItemsOnGrid();
+    // TODO(svillar): we won't need to do this once the intrinsic width
+    // computation is isolated from the LayoutGrid object state (it should not
+    // touch any attribute) (see crbug.com/627812)
+    if (m_autoRepeatColumns &&
+        m_autoRepeatColumns !=
+            computeAutoRepeatTracksCount(ForColumns, TrackSizing))
+      dirtyGrid();
+    placeItemsOnGrid(TrackSizing);
 
     GridSizingData sizingData(gridColumnCount(), gridRowCount());
 
@@ -687,9 +693,7 @@ LayoutUnit LayoutGrid::guttersSize(GridTrackSizingDirection direction,
 void LayoutGrid::computeIntrinsicLogicalWidths(
     LayoutUnit& minLogicalWidth,
     LayoutUnit& maxLogicalWidth) const {
-  const_cast<LayoutGrid*>(this)->updateAutoRepeatTracksAndSetDirtyIfNeeded(
-      IntrinsicSizeComputation);
-  const_cast<LayoutGrid*>(this)->placeItemsOnGrid();
+  const_cast<LayoutGrid*>(this)->placeItemsOnGrid(IntrinsicSizeComputation);
 
   GridSizingData sizingData(gridColumnCount(), gridRowCount());
   computeTrackSizesForIndefiniteSize(ForColumns, sizingData, minLogicalWidth,
@@ -1827,21 +1831,6 @@ void LayoutGrid::insertItemIntoGrid(LayoutBox& child, const GridArea& area) {
   }
 }
 
-void LayoutGrid::updateAutoRepeatTracksAndSetDirtyIfNeeded(
-    SizingOperation sizingOperation) {
-  size_t newAutoRepeatColumns =
-      computeAutoRepeatTracksCount(ForColumns, sizingOperation);
-  size_t newAutoRepeatRows =
-      computeAutoRepeatTracksCount(ForRows, sizingOperation);
-
-  if (m_autoRepeatColumns != newAutoRepeatColumns ||
-      m_autoRepeatRows != newAutoRepeatRows)
-    dirtyGrid();
-
-  m_autoRepeatColumns = newAutoRepeatColumns;
-  m_autoRepeatRows = newAutoRepeatRows;
-}
-
 size_t LayoutGrid::computeAutoRepeatTracksCount(
     GridTrackSizingDirection direction,
     SizingOperation sizingOperation) const {
@@ -1982,12 +1971,20 @@ LayoutGrid::computeEmptyTracksForAutoRepeat(
   return emptyTrackIndexes;
 }
 
-void LayoutGrid::placeItemsOnGrid() {
+void LayoutGrid::placeItemsOnGrid(SizingOperation sizingOperation) {
   if (!m_gridIsDirty)
     return;
 
   DCHECK(m_gridItemArea.isEmpty());
 
+  if (sizingOperation == IntrinsicSizeComputation) {
+    m_autoRepeatColumns = styleRef().gridAutoRepeatColumns().size();
+  } else {
+    m_autoRepeatColumns =
+        computeAutoRepeatTracksCount(ForColumns, sizingOperation);
+  }
+  m_autoRepeatRows = computeAutoRepeatTracksCount(ForRows, sizingOperation);
+
   populateExplicitGridAndOrderIterator();
 
   // We clear the dirty bit here as the grid sizes have been updated.