| Index: third_party/WebKit/Source/core/layout/LayoutGrid.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.h b/third_party/WebKit/Source/core/layout/LayoutGrid.h
|
| index 40e9a4c6ea5458a38abcb66ef34b98d379ec1e89..b83b4fc3ee18a680b8d1ed31a73e50436f0ff737 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutGrid.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h
|
| @@ -142,9 +142,9 @@ private:
|
| 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);
|
|
|
| @@ -205,7 +205,7 @@ private:
|
| void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&);
|
|
|
| #if ENABLE(ASSERT)
|
| - bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingData&);
|
| + bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingData&) const;
|
| #endif
|
|
|
| LayoutUnit gridGapForDirection(GridTrackSizingDirection, SizingOperation) const;
|
|
|