| Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| index 6d8864e4a0d6d97a786ebe9bb66b5cfebf6bd4b9..82ece97e74528777e36f0ef59a330b71898004ce 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| @@ -516,7 +516,7 @@ void LayoutGrid::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo
|
| GridSizingData sizingData(gridColumnCount(), gridRowCount());
|
| sizingData.freeSpaceForDirection(ForColumns) = LayoutUnit();
|
| sizingData.sizingOperation = IntrinsicSizeComputation;
|
| - const_cast<LayoutGrid*>(this)->computeUsedBreadthOfGridTracks(ForColumns, sizingData, minLogicalWidth, maxLogicalWidth);
|
| + computeUsedBreadthOfGridTracks(ForColumns, sizingData, minLogicalWidth, maxLogicalWidth);
|
|
|
| LayoutUnit totalGuttersSize = guttersSize(ForColumns, sizingData.columnTracks.size());
|
| minLogicalWidth += totalGuttersSize;
|
| @@ -567,7 +567,7 @@ static inline double normalizedFlexFraction(const GridTrack& track, double flexF
|
| return track.baseSize() / std::max<double>(1, flexFactor);
|
| }
|
|
|
| -void LayoutGrid::computeUsedBreadthOfGridTracks(GridTrackSizingDirection direction, GridSizingData& sizingData, LayoutUnit& baseSizesWithoutMaximization, LayoutUnit& growthLimitsWithoutMaximization)
|
| +void LayoutGrid::computeUsedBreadthOfGridTracks(GridTrackSizingDirection direction, GridSizingData& sizingData, LayoutUnit& baseSizesWithoutMaximization, LayoutUnit& growthLimitsWithoutMaximization) const
|
| {
|
| LayoutUnit& freeSpace = sizingData.freeSpaceForDirection(direction);
|
| const LayoutUnit initialFreeSpace = freeSpace;
|
| @@ -840,7 +840,7 @@ bool LayoutGrid::isOrthogonalChild(const LayoutBox& child) const
|
| return child.isHorizontalWritingMode() != isHorizontalWritingMode();
|
| }
|
|
|
| -LayoutUnit LayoutGrid::logicalHeightForChild(LayoutBox& child, GridSizingData& sizingData)
|
| +LayoutUnit LayoutGrid::logicalHeightForChild(LayoutBox& child, GridSizingData& sizingData) const
|
| {
|
| GridTrackSizingDirection childBlockDirection = flowAwareDirectionForChild(child, ForRows);
|
| SubtreeLayoutScope layoutScope(child);
|
| @@ -864,7 +864,7 @@ GridTrackSizingDirection LayoutGrid::flowAwareDirectionForChild(const LayoutBox&
|
| return !isOrthogonalChild(child) ? direction : (direction == ForColumns ? ForRows : ForColumns);
|
| }
|
|
|
| -LayoutUnit LayoutGrid::minSizeForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData)
|
| +LayoutUnit LayoutGrid::minSizeForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData) const
|
| {
|
| GridTrackSizingDirection childInlineDirection = flowAwareDirectionForChild(child, ForColumns);
|
| bool isRowAxis = direction == childInlineDirection;
|
| @@ -885,7 +885,7 @@ LayoutUnit LayoutGrid::minSizeForChild(LayoutBox& child, GridTrackSizingDirectio
|
| return child.computeLogicalHeightUsing(MinSize, childMinSize, child.intrinsicLogicalHeight()) + child.marginLogicalHeight() + child.scrollbarLogicalHeight();
|
| }
|
|
|
| -bool LayoutGrid::updateOverrideContainingBlockContentSizeForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData)
|
| +bool LayoutGrid::updateOverrideContainingBlockContentSizeForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData) const
|
| {
|
| LayoutUnit overrideSize = gridAreaBreadthForChild(child, direction, sizingData);
|
| if (hasOverrideContainingBlockContentSizeForChild(child, direction) && overrideContainingBlockContentSizeForChild(child, direction) == overrideSize)
|
| @@ -895,7 +895,7 @@ bool LayoutGrid::updateOverrideContainingBlockContentSizeForChild(LayoutBox& chi
|
| return true;
|
| }
|
|
|
| -LayoutUnit LayoutGrid::minContentForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData)
|
| +LayoutUnit LayoutGrid::minContentForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData) const
|
| {
|
| GridTrackSizingDirection childInlineDirection = flowAwareDirectionForChild(child, ForColumns);
|
| if (direction == childInlineDirection) {
|
| @@ -924,7 +924,7 @@ LayoutUnit LayoutGrid::minContentForChild(LayoutBox& child, GridTrackSizingDirec
|
| return logicalHeightForChild(child, sizingData);
|
| }
|
|
|
| -LayoutUnit LayoutGrid::maxContentForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData)
|
| +LayoutUnit LayoutGrid::maxContentForChild(LayoutBox& child, GridTrackSizingDirection direction, GridSizingData& sizingData) const
|
| {
|
| GridTrackSizingDirection childInlineDirection = flowAwareDirectionForChild(child, ForColumns);
|
| if (direction == childInlineDirection) {
|
| @@ -986,7 +986,7 @@ bool LayoutGrid::spanningItemCrossesFlexibleSizedTracks(const GridSpan& span, Gr
|
| return false;
|
| }
|
|
|
| -void LayoutGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection direction, GridSizingData& sizingData)
|
| +void LayoutGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection direction, GridSizingData& sizingData) const
|
| {
|
| sizingData.itemsSortedByIncreasingSpan.shrink(0);
|
| if (!m_gridItemArea.isEmpty()) {
|
| @@ -1027,7 +1027,7 @@ void LayoutGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirectio
|
| }
|
| }
|
|
|
| -void LayoutGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan& span, LayoutBox& gridItem, GridTrack& track, GridSizingData& sizingData)
|
| +void LayoutGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan& span, LayoutBox& gridItem, GridTrack& track, GridSizingData& sizingData) const
|
| {
|
| const size_t trackPosition = span.startLine();
|
| GridTrackSize trackSize = gridTrackSize(direction, trackPosition, sizingData.sizingOperation);
|
| @@ -1150,7 +1150,7 @@ static void updateTrackSizeForTrackSizeComputationPhase(TrackSizeComputationPhas
|
| ASSERT_NOT_REACHED();
|
| }
|
|
|
| -LayoutUnit LayoutGrid::currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase phase, LayoutBox& gridItem, GridTrackSizingDirection direction, GridSizingData& sizingData)
|
| +LayoutUnit LayoutGrid::currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase phase, LayoutBox& gridItem, GridTrackSizingDirection direction, GridSizingData& sizingData) const
|
| {
|
| switch (phase) {
|
| case ResolveIntrinsicMinimums:
|
| @@ -1171,7 +1171,7 @@ LayoutUnit LayoutGrid::currentItemSizeForTrackSizeComputationPhase(TrackSizeComp
|
| }
|
|
|
| template <TrackSizeComputationPhase phase>
|
| -void LayoutGrid::resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection direction, GridSizingData& sizingData, const GridItemsSpanGroupRange& gridItemsWithSpan)
|
| +void LayoutGrid::resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection direction, GridSizingData& sizingData, const GridItemsSpanGroupRange& gridItemsWithSpan) const
|
| {
|
| Vector<GridTrack>& tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
|
| for (const auto& trackIndex : sizingData.contentSizedTracksIndex) {
|
| @@ -1232,7 +1232,7 @@ static bool sortByGridTrackGrowthPotential(const GridTrack* track1, const GridTr
|
| }
|
|
|
| template <TrackSizeComputationPhase phase>
|
| -void LayoutGrid::distributeSpaceToTracks(Vector<GridTrack*>& tracks, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, GridSizingData& sizingData, LayoutUnit& availableLogicalSpace)
|
| +void LayoutGrid::distributeSpaceToTracks(Vector<GridTrack*>& tracks, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, GridSizingData& sizingData, LayoutUnit& availableLogicalSpace) const
|
| {
|
| ASSERT(availableLogicalSpace >= 0);
|
|
|
|
|