[css-grid] Pass Grid as argument to more methods & remove m_gridIsDirty

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 45 matching lines @@
   static LayoutGrid* createAnonymous(Document*);
   const char* name() const override { return "LayoutGrid"; }
 
   void layoutBlock(bool relayoutChildren) override;
 
   void dirtyGrid();
 
   Vector<LayoutUnit> trackSizesForComputedStyle(GridTrackSizingDirection) const;
 
   const Vector<LayoutUnit>& columnPositions() const {
-    ASSERT(!m_gridIsDirty);
+    DCHECK(!m_grid.needsItemsPlacement());
     return m_columnPositions;
   }
 
   const Vector<LayoutUnit>& rowPositions() const {
-    ASSERT(!m_gridIsDirty);
+    DCHECK(!m_grid.needsItemsPlacement());
     return m_rowPositions;
   }
 
   typedef Vector<LayoutBox*, 1> GridCell;
   const GridCell& gridCell(int row, int column) const {
-    SECURITY_DCHECK(!m_gridIsDirty);
+    SECURITY_DCHECK(!m_grid.needsItemsPlacement());
     return m_grid.cell(row, column);
   }
 
   const Vector<LayoutBox*>& itemsOverflowingGridArea() const {
-    SECURITY_DCHECK(!m_gridIsDirty);
+    SECURITY_DCHECK(!m_grid.needsItemsPlacement());
     return m_gridItemsOverflowingGridArea;
   }
 
   int paintIndexForGridItem(const LayoutBox* layoutBox) const {
-    SECURITY_DCHECK(!m_gridIsDirty);
+    SECURITY_DCHECK(!m_grid.needsItemsPlacement());
     return m_grid.gridItemPaintOrder(*layoutBox);
   }
 
   size_t autoRepeatCountForDirection(GridTrackSizingDirection direction) const {
     return m_grid.autoRepeatTracks(direction);
   }
 
   LayoutUnit translateRTLCoordinate(LayoutUnit) const;
 
  private:
@@ skipping 11 matching lines @@
 
   void addChild(LayoutObject* newChild,
                 LayoutObject* beforeChild = nullptr) override;
   void removeChild(LayoutObject*) override;
 
   void styleDidChange(StyleDifference, const ComputedStyle*) override;
 
   bool explicitGridDidResize(const ComputedStyle&) const;
   bool namedGridLinesDefinitionDidChange(const ComputedStyle&) const;
 
+  class Grid;
   class GridIterator;
   struct GridSizingData;
   enum SizingOperation { TrackSizing, IntrinsicSizeComputation };
   void computeUsedBreadthOfGridTracks(
       GridTrackSizingDirection,
       GridSizingData&,
       LayoutUnit& baseSizesWithoutMaximization,
       LayoutUnit& growthLimitsWithoutMaximization) const;
   void computeFlexSizedTracksGrowth(
       GridTrackSizingDirection,
       Vector<GridTrack>&,
       const Vector<size_t>& flexibleSizedTracksIndex,
       double flexFraction,
       Vector<LayoutUnit>& increments,
       LayoutUnit& totalGrowth) const;
   LayoutUnit computeUsedBreadthOfMinLength(const GridTrackSize&,
                                            LayoutUnit maxBreadth) const;
   LayoutUnit computeUsedBreadthOfMaxLength(const GridTrackSize&,
                                            LayoutUnit usedBreadth,
                                            LayoutUnit maxBreadth) const;
   void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection,
                                                GridSizingData&) const;
 
   size_t computeAutoRepeatTracksCount(GridTrackSizingDirection,
                                       SizingOperation) const;
 
   typedef ListHashSet<size_t> OrderedTrackIndexSet;
   std::unique_ptr<OrderedTrackIndexSet> computeEmptyTracksForAutoRepeat(
+      Grid&,
       GridTrackSizingDirection) const;
 
-  class Grid;
   void placeItemsOnGrid(Grid&, SizingOperation);
   void populateExplicitGridAndOrderIterator(Grid&) const;
   std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(
+      const Grid&,
       const LayoutBox&,
       GridTrackSizingDirection,
       const GridSpan& specifiedPositions) const;
   void placeSpecifiedMajorAxisItemsOnGrid(Grid&,
                                           const Vector<LayoutBox*>&) const;
   void placeAutoMajorAxisItemsOnGrid(Grid&, const Vector<LayoutBox*>&) const;
   void placeAutoMajorAxisItemOnGrid(
       Grid&,
       LayoutBox&,
       std::pair<size_t, size_t>& autoPlacementCursor) const;
@@ skipping 167 matching lines @@
                                               GridTrackSizingDirection,
                                               SizingOperation) const;
 
   bool isOrthogonalChild(const LayoutBox&) const;
   GridTrackSizingDirection flowAwareDirectionForChild(
       const LayoutBox&,
       GridTrackSizingDirection) const;
 
   bool cachedHasDefiniteLogicalHeight() const;
 
-  size_t numTracks(GridTrackSizingDirection) const;
+  size_t numTracks(GridTrackSizingDirection, const Grid&) const;
 
   // TODO(svillar): move into this class once GridIterator is added.
   typedef Vector<Vector<GridCell>> GridAsMatrix;
   class Grid final {
    public:
     Grid(LayoutGrid* grid) : m_orderIterator(grid) {}
 
     size_t numTracks(GridTrackSizingDirection) const;
 
     void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize);
@@ skipping 29 matching lines @@
     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();
+    void setNeedsItemsPlacement(bool);
+    bool needsItemsPlacement() const { return m_needsItemsPlacement; };
 
 #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_hasAnyOrthogonalGridItem{false};
+    bool m_needsItemsPlacement{true};
+
     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;

[Manuel Rego, 2016/12/02 10:21:38]

Do you have plans to move these to Grid too?

We talked that we should clear this information too at some point.

   LayoutUnit m_offsetBetweenColumns;
   LayoutUnit m_offsetBetweenRows;
   Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
 
   LayoutUnit m_minContentHeight{-1};
   LayoutUnit m_maxContentHeight{-1};
 
   Optional<bool> m_hasDefiniteLogicalHeight;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
 
 }  // namespace blink
 
 #endif  // LayoutGrid_h