[css-grid] Refactor intrinsic size computation code

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 124 matching lines @@
 
     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&, std::pair<size_t, size_t>& autoPlacementCursor);
     GridTrackSizingDirection autoPlacementMajorAxisDirection() const;
     GridTrackSizingDirection autoPlacementMinorAxisDirection() const;
 
-    void computeIntrinsicLogicalHeight(GridSizingData&);
+    void computeTrackSizesForIndefiniteSize(GridTrackSizingDirection, GridSizingData&, LayoutUnit& minIntrinsicSize, LayoutUnit& maxIntrinsicSize) const;
     LayoutUnit computeTrackBasedLogicalHeight(const GridSizingData&) const;
-    void computeTrackSizesForDirection(GridTrackSizingDirection, GridSizingData&, LayoutUnit freeSpace);
+    void computeTrackSizesForDefiniteSize(GridTrackSizingDirection, GridSizingData&, LayoutUnit freeSpace) const;
 
     void repeatTracksSizingIfNeeded(GridSizingData&, LayoutUnit availableSpaceForColumns, LayoutUnit availableSpaceForRows);
 
     void layoutGridItems(GridSizingData&);
     void prepareChildForPositionedLayout(LayoutBox&);
     void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);
     void offsetAndBreadthForPositionedChild(const LayoutBox&, GridTrackSizingDirection, LayoutUnit& offset, LayoutUnit& breadth);
     void populateGridPositionsForDirection(GridSizingData&, GridTrackSizingDirection);
 
     typedef struct GridItemsSpanGroupRange GridItemsSpanGroupRange;
@@ skipping 40 matching lines @@
     bool hasAutoSizeInColumnAxis(const LayoutBox& child) const { return isHorizontalWritingMode() ? child.styleRef().height().isAuto() : child.styleRef().width().isAuto(); }
     bool hasAutoSizeInRowAxis(const LayoutBox& child) const { return isHorizontalWritingMode() ? child.styleRef().width().isAuto() : child.styleRef().height().isAuto(); }
     bool allowedToStretchChildAlongColumnAxis(const LayoutBox& child) const { return alignSelfForChild(child).position() == ItemPositionStretch && hasAutoSizeInColumnAxis(child) && !hasAutoMarginsInColumnAxis(child); }
     bool allowedToStretchChildAlongRowAxis(const LayoutBox& child) const { return justifySelfForChild(child).position() == ItemPositionStretch && hasAutoSizeInRowAxis(child) && !hasAutoMarginsInRowAxis(child); }
     bool hasAutoMarginsInColumnAxis(const LayoutBox&) const;
     bool hasAutoMarginsInRowAxis(const LayoutBox&) const;
     void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&);
     void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&);
 
 #if ENABLE(ASSERT)
-    bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingData&);
+    bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingData&) const;
 #endif
 
     LayoutUnit gridGapForDirection(GridTrackSizingDirection, SizingOperation) const;
     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;
@@ skipping 30 matching lines @@
     std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows { nullptr };
 
     Optional<bool> m_hasDefiniteLogicalHeight;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
 
 } // namespace blink
 
 #endif // LayoutGrid_h