[css-grid] Move more 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 71 matching lines @@
     SECURITY_DCHECK(!m_gridIsDirty);
     return m_gridItemsOverflowingGridArea;
   }
 
   int paintIndexForGridItem(const LayoutBox* layoutBox) const {
     SECURITY_DCHECK(!m_gridIsDirty);
     return m_grid.gridItemPaintOrder(*layoutBox);
   }
 
   size_t autoRepeatCountForDirection(GridTrackSizingDirection direction) const {
-    return direction == ForColumns ? m_autoRepeatColumns : m_autoRepeatRows;
+    return m_grid.autoRepeatTracks(direction);
   }
 
   LayoutUnit translateRTLCoordinate(LayoutUnit) const;
 
  private:
   bool isOfType(LayoutObjectType type) const override {
     return type == LayoutObjectLayoutGrid || LayoutBlock::isOfType(type);
   }
   void computeIntrinsicLogicalWidths(
       LayoutUnit& minLogicalWidth,
@@ skipping 36 matching lines @@
   void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection,
                                                GridSizingData&) const;
 
   size_t computeAutoRepeatTracksCount(GridTrackSizingDirection,
                                       SizingOperation) const;
 
   typedef ListHashSet<size_t> OrderedTrackIndexSet;
   std::unique_ptr<OrderedTrackIndexSet> computeEmptyTracksForAutoRepeat(
       GridTrackSizingDirection) const;
 
-  bool hasAutoRepeatEmptyTracks(GridTrackSizingDirection) const;
-  bool isEmptyAutoRepeatTrack(GridTrackSizingDirection,
-                              size_t lineNumber) const;
-
   void placeItemsOnGrid(SizingOperation);
   void populateExplicitGridAndOrderIterator();
   std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(
       const LayoutBox&,
       GridTrackSizingDirection,
       const GridSpan& specifiedPositions) const;
   void placeSpecifiedMajorAxisItemsOnGrid(const Vector<LayoutBox*>&);
   void placeAutoMajorAxisItemsOnGrid(const Vector<LayoutBox*>&);
   void placeAutoMajorAxisItemOnGrid(
       LayoutBox&,
@@ skipping 161 matching lines @@
   LayoutUnit guttersSize(GridTrackSizingDirection,
                          size_t startLine,
                          size_t span,
                          SizingOperation) const;
 
   size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection);
   bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&,
                                               GridTrackSizingDirection,
                                               SizingOperation) const;
 
-  size_t gridColumnCount() const;
-  size_t gridRowCount() const;
-
   bool isOrthogonalChild(const LayoutBox&) const;
   GridTrackSizingDirection flowAwareDirectionForChild(
       const LayoutBox&,
       GridTrackSizingDirection) const;
 
   bool cachedHasDefiniteLogicalHeight() const;
 
   size_t numTracks(GridTrackSizingDirection) const;
 
   // TODO(svillar): move into this class once GridIterator is added.
   typedef Vector<Vector<GridCell>> GridAsMatrix;
   class Grid final {
    public:
-    Grid() {}
+    Grid(LayoutGrid* grid) : m_orderIterator(grid) {}
 
-    size_t numColumns() const { return m_grid.size() ? m_grid[0].size() : 0; }
-    size_t numRows() const { return m_grid.size(); }
+    size_t numTracks(GridTrackSizingDirection) const;
 
     void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize);
     void insert(LayoutBox&, const GridArea&, bool isOrthogonalChild);
 
     bool hasInFlowGridItems() const { return !m_gridItemArea.isEmpty(); }
     bool hasAnyOrthogonalChildren() const { return m_hasAnyOrthogonalChildren; }
 
     GridArea gridItemArea(const LayoutBox& item) const;
     void setGridItemArea(const LayoutBox& item, GridArea);
 
+    GridSpan gridItemSpan(const LayoutBox&, GridTrackSizingDirection) const;
+
     size_t gridItemPaintOrder(const LayoutBox& item) const;
     void setGridItemPaintOrder(const LayoutBox& item, size_t order);
 
     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);
 
+    size_t autoRepeatTracks(GridTrackSizingDirection) const;
+    void setAutoRepeatTracks(size_t autoRepeatRows, size_t autoRepeatColumns);
+
+    void setAutoRepeatEmptyColumns(std::unique_ptr<OrderedTrackIndexSet>);
+    void setAutoRepeatEmptyRows(std::unique_ptr<OrderedTrackIndexSet>);
+
+    size_t autoRepeatEmptyTracksCount(GridTrackSizingDirection) const;
+    bool hasAutoRepeatEmptyTracks(GridTrackSizingDirection) const;
+    bool isEmptyAutoRepeatTrack(GridTrackSizingDirection, size_t) const;
+
+    OrderedTrackIndexSet* autoRepeatEmptyTracks(GridTrackSizingDirection) const;
+
+    OrderIterator& orderIterator() { return m_orderIterator; }
+
     void shrinkToFit() { m_grid.shrinkToFit(); }
     void clear();
 
 #if ENABLE(ASSERT)
     bool hasAnyGridItemPaintOrder() const;
 #endif
 
    private:
     friend class GridIterator;
 
+    OrderIterator m_orderIterator;
+
     int m_smallestColumnStart{0};
     int m_smallestRowStart{0};
 
+    size_t m_autoRepeatColumns{0};
+    size_t m_autoRepeatRows{0};
+
     bool m_hasAnyOrthogonalChildren{false};
     GridAsMatrix m_grid;
 
     HashMap<const LayoutBox*, GridArea> m_gridItemArea;
     HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap;
+
+    std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyColumns{nullptr};
+    std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows{nullptr};
   };
   Grid m_grid;
 
   bool m_gridIsDirty;
   Vector<LayoutUnit> m_rowPositions;
   Vector<LayoutUnit> m_columnPositions;
   LayoutUnit m_offsetBetweenColumns;
   LayoutUnit m_offsetBetweenRows;
-  OrderIterator m_orderIterator;
   Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
 
   LayoutUnit m_minContentHeight{-1};
   LayoutUnit m_maxContentHeight{-1};
 
-  size_t m_autoRepeatColumns{0};
-  size_t m_autoRepeatRows{0};
-
-  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