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

third_party/WebKit/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 "core/paint/GridPainter.h"
 
 #include "core/layout/LayoutGrid.h"
 #include "core/paint/BlockPainter.h"
 #include "core/paint/PaintInfo.h"
 #include <algorithm>
@@ skipping 18 matching lines @@
                        coordinates.end() - 1, end) -
       coordinates.begin();
   if (endGridAreaIndex > 0)
     --endGridAreaIndex;
 
   // GridSpan stores lines' indexes (not tracks' indexes).
   return GridSpan::translatedDefiniteGridSpan(startGridAreaIndex,
                                               endGridAreaIndex + 1);
 }
 
-class GridItemsSorter {
- public:
-  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;
-  }
-};
+// Helper for the sorting of grid items following order-modified document order.
+// See http://www.w3.org/TR/css-flexbox/#order-modified-document-order
+static inline bool compareOrderModifiedDocumentOrder(
+    const std::pair<LayoutBox*, size_t>& firstItem,
+    const std::pair<LayoutBox*, size_t>& secondItem) {
+  return firstItem.second < secondItem.second;
+}
 
 void GridPainter::paintChildren(const PaintInfo& paintInfo,
                                 const LayoutPoint& paintOffset) {
   ASSERT(!m_layoutGrid.needsLayout());
 
   LayoutRect localPaintInvalidationRect =
       LayoutRect(paintInfo.cullRect().m_rect);
   localPaintInvalidationRect.moveBy(-paintOffset);
 
   Vector<LayoutUnit> columnPositions = m_layoutGrid.columnPositions();
@@ skipping 35 matching lines @@
             std::make_pair(child, m_layoutGrid.paintIndexForGridItem(child)));
     }
   }
 
   for (auto* item : m_layoutGrid.itemsOverflowingGridArea()) {
     if (item->frameRect().intersects(localPaintInvalidationRect))
       gridItemsToBePainted.append(
           std::make_pair(item, m_layoutGrid.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());
+                   compareOrderModifiedDocumentOrder);
 
   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.
     LayoutBox* current = gridItemAndPaintIndex.first;
     if (current == previous)
       continue;
 
     BlockPainter(m_layoutGrid)
         .paintAllChildPhasesAtomically(*current, paintInfo, paintOffset);
     previous = current;
   }
 }
 
 }  // namespace blink