[css-grid] Use order-modified document order for m_gridItemsIndexesMap

third_party/WebKit/Source/core/layout/LayoutGrid.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 1904 matching lines @@
     }
   }
   return emptyTrackIndexes;
 }
 
 void LayoutGrid::placeItemsOnGrid() {
   if (!m_gridIsDirty)
     return;
 
   DCHECK(m_gridItemArea.isEmpty());
-  DCHECK(m_gridItemsIndexesMap.isEmpty());
 
   populateExplicitGridAndOrderIterator();
 
   // We clear the dirty bit here as the grid sizes have been updated.
   m_gridIsDirty = false;
 
   Vector<LayoutBox*> autoMajorAxisAutoGridItems;
   Vector<LayoutBox*> specifiedMajorAxisAutoGridItems;
+  DCHECK(m_gridItemsIndexesMap.isEmpty());
+  size_t childIndex = 0;
   m_hasAnyOrthogonalChildren = false;
   for (LayoutBox* child = m_orderIterator.first(); child;
        child = m_orderIterator.next()) {
     if (child->isOutOfFlowPositioned())
       continue;
 
+    m_gridItemsIndexesMap.set(child, childIndex++);
+
     m_hasAnyOrthogonalChildren =
         m_hasAnyOrthogonalChildren || isOrthogonalChild(*child);
 
     GridArea area = cachedGridArea(*child);
     if (!area.rows.isIndefinite())
       area.rows.translate(abs(m_smallestRowStart));
     if (!area.columns.isIndefinite())
       area.columns.translate(abs(m_smallestColumnStart));
     m_gridItemArea.set(child, area);
 
@@ skipping 40 matching lines @@
 void LayoutGrid::populateExplicitGridAndOrderIterator() {
   OrderIteratorPopulator populator(m_orderIterator);
 
   m_smallestRowStart = m_smallestColumnStart = 0;
 
   size_t maximumRowIndex =
       GridPositionsResolver::explicitGridRowCount(*style(), m_autoRepeatRows);
   size_t maximumColumnIndex = GridPositionsResolver::explicitGridColumnCount(
       *style(), m_autoRepeatColumns);
 
-  ASSERT(m_gridItemsIndexesMap.isEmpty());
-  size_t childIndex = 0;
   for (LayoutBox* child = firstInFlowChildBox(); child;
        child = child->nextInFlowSiblingBox()) {
     populator.collectChild(child);
-    m_gridItemsIndexesMap.set(child, childIndex++);
 
     // This function bypasses the cache (cachedGridArea()) as it is used to
     // build it.
     GridSpan rowPositions =
         GridPositionsResolver::resolveGridPositionsFromStyle(
             *style(), *child, ForRows, m_autoRepeatRows);
     GridSpan columnPositions =
         GridPositionsResolver::resolveGridPositionsFromStyle(
             *style(), *child, ForColumns, m_autoRepeatColumns);
     m_gridItemArea.set(child, GridArea(rowPositions, columnPositions));
@@ skipping 1307 matching lines @@
   if (!m_gridItemArea.isEmpty())
     GridPainter(*this).paintChildren(paintInfo, paintOffset);
 }
 
 bool LayoutGrid::cachedHasDefiniteLogicalHeight() const {
   SECURITY_DCHECK(m_hasDefiniteLogicalHeight);
   return m_hasDefiniteLogicalHeight.value();
 }
 
 }  // namespace blink