| Index: third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
|
| diff --git a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
|
| index e7a8af6ae986d40d881720d7ce0e7cd95094ebb3..675a93cfa82bed6de459bb028348550d2630bbb0 100644
|
| --- a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
|
| +++ b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.h
|
| @@ -21,8 +21,6 @@ class Grid;
|
| class GridTrackSizingAlgorithmStrategy;
|
| class LayoutGrid;
|
|
|
| -enum SizingOperation { kTrackSizing, kIntrinsicSizeComputation };
|
| -
|
| enum TrackSizeComputationPhase {
|
| kResolveIntrinsicMinimums,
|
| kResolveContentBasedMinimums,
|
| @@ -86,7 +84,6 @@ class GridTrackSizingAlgorithm final {
|
| // the algorithm.
|
| void Setup(GridTrackSizingDirection,
|
| size_t num_tracks,
|
| - SizingOperation,
|
| Optional<LayoutUnit> available_space,
|
| Optional<LayoutUnit> free_space);
|
| void Run();
|
| @@ -190,7 +187,6 @@ class GridTrackSizingAlgorithm final {
|
| Vector<size_t> flexible_sized_tracks_index_;
|
|
|
| GridTrackSizingDirection direction_;
|
| - SizingOperation sizing_operation_;
|
|
|
| Grid& grid_;
|
|
|
| @@ -266,6 +262,8 @@ class GridTrackSizingAlgorithmStrategy {
|
| LayoutBox&,
|
| GridTrackSizingDirection) const;
|
| LayoutUnit ComputeTrackBasedSize() const;
|
| + Optional<LayoutUnit> ExtentForBaselineAlignment(LayoutBox&) const;
|
| +
|
| GridTrackSizingDirection Direction() const { return algorithm_.direction_; }
|
| double FindFrUnitSize(const GridSpan& tracks_span,
|
| LayoutUnit left_over_space) const;
|
|
|