[css-grid] Move LayoutGrid attributes to Grid class

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

 /*
  * 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 67 matching lines @@
     return m_grid.cell(row, column);
   }
 
   const Vector<LayoutBox*>& itemsOverflowingGridArea() const {
     SECURITY_DCHECK(!m_gridIsDirty);
     return m_gridItemsOverflowingGridArea;
   }
 
   int paintIndexForGridItem(const LayoutBox* layoutBox) const {
     SECURITY_DCHECK(!m_gridIsDirty);
-    return m_gridItemsIndexesMap.get(layoutBox);
+    return m_grid.gridItemPaintOrder(*layoutBox);
   }
 
   size_t autoRepeatCountForDirection(GridTrackSizingDirection direction) const {
     return direction == ForColumns ? m_autoRepeatColumns : m_autoRepeatRows;
   }
 
   LayoutUnit translateRTLCoordinate(LayoutUnit) const;
 
  private:
   bool isOfType(LayoutObjectType type) const override {
@@ skipping 247 matching lines @@
   // TODO(svillar): move into this class once GridIterator is added.
   typedef Vector<Vector<GridCell>> GridAsMatrix;
   class Grid final {
    public:
     Grid() {}
 
     size_t numColumns() const { return m_grid.size() ? m_grid[0].size() : 0; }
     size_t numRows() const { return m_grid.size(); }
 
     void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize);
-    void insert(LayoutBox&, const GridArea&);
+    void insert(LayoutBox&, const GridArea&, bool isOrthogonalChild);
+
+    bool hasInFlowGridItems() const { return !m_gridItemArea.isEmpty(); }

[Manuel Rego, 2016/11/23 13:30:36]

Really cool you're adding this method!

+    bool hasAnyOrthogonalChildren() const { return m_hasAnyOrthogonalChildren; }
+
+    GridArea gridItemArea(const LayoutBox& item) const;

[Manuel Rego, 2016/11/23 13:30:36]

I think you can omit the variable name here.

[svillar, 2016/11/23 14:10:30]

The style checker didn't complain so I left them. LayoutBox does not say much so
perhaps having the "item" word is not a bad thing to have.

+    void setGridItemArea(const LayoutBox& item, GridArea);

[Manuel Rego, 2016/11/23 13:30:36]

Ditto.

+
+    size_t gridItemPaintOrder(const LayoutBox& item) const;

[Manuel Rego, 2016/11/23 13:30:36]

Ditto.

+    void setGridItemPaintOrder(const LayoutBox& item, size_t order);

[Manuel Rego, 2016/11/23 13:30:36]

Ditto.

 
     const GridCell& cell(size_t row, size_t column) const {
       return m_grid[row][column];
     }
 
+    int smallestTrackStart(GridTrackSizingDirection) const;
+    void setSmallestTracksStart(int rowStart, int columnStart);
+
     void shrinkToFit() { m_grid.shrinkToFit(); }
+    void clear();
 
-    void clear();
+#if ENABLE(ASSERT)
+    bool hasAnyGridItemPaintOrder() const;
+#endif
 
    private:
     friend class GridIterator;
+
+    int m_smallestColumnStart{0};
+    int m_smallestRowStart{0};
+
+    bool m_hasAnyOrthogonalChildren{false};
     GridAsMatrix m_grid;
+
+    HashMap<const LayoutBox*, GridArea> m_gridItemArea;
+    HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap;
   };
   Grid m_grid;
 
   bool m_gridIsDirty;
   Vector<LayoutUnit> m_rowPositions;
   Vector<LayoutUnit> m_columnPositions;
   LayoutUnit m_offsetBetweenColumns;
   LayoutUnit m_offsetBetweenRows;
-  HashMap<const LayoutBox*, GridArea> m_gridItemArea;
   OrderIterator m_orderIterator;
   Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
-  HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap;
 
   LayoutUnit m_minContentHeight{-1};
   LayoutUnit m_maxContentHeight{-1};
 
-  int m_smallestRowStart;
-  int m_smallestColumnStart;
-
   size_t m_autoRepeatColumns{0};
   size_t m_autoRepeatRows{0};
 
-  bool m_hasAnyOrthogonalChildren;
-
   std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyColumns{nullptr};
   std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows{nullptr};
 
   Optional<bool> m_hasDefiniteLogicalHeight;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
 
 }  // namespace blink
 
 #endif  // LayoutGrid_h