Source/core/rendering/RenderGrid.h - Issue 845313003: [CSS Grid Layout] Tracks growing beyond limits when they should not

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderGrid.h

Issue 845313003: [CSS Grid Layout] Tracks growing beyond limits when they should not (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Bring old-style loops back. Ensure that planned increases are applied. Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html ('K') | « LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution-expected.txt ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderGrid.h

diff --git a/Source/core/rendering/RenderGrid.h b/Source/core/rendering/RenderGrid.h

index f21236adaaf0efe16552e8f95dec714e11d8bb35..815f9912bc05930832665b394dce8b7d3bf4d561 100644

--- a/Source/core/rendering/RenderGrid.h

+++ b/Source/core/rendering/RenderGrid.h

@@ -60,6 +60,7 @@ public:

bool gridIsDirty() const { return m_gridIsDirty; }

+ typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);

private:

virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderGrid || RenderBlock::isOfType(type); }

virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;

@@ -101,11 +102,10 @@ private:

typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>&);

typedef const LayoutUnit& (GridTrack::* AccumulatorGetter)() const;

- typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);

typedef bool (GridTrackSize::* FilterFunction)() const;

void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridCoordinate&, RenderBox& gridItem, GridTrack&, Vector<GridTrack>& columnTracks);

void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, GridItemWithSpan&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction, FilterFunction growAboveMaxBreadthFilterFunction = nullptr);

- void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<size_t>* tracksForGrowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizingData&, LayoutUnit& availableLogicalSpace);

+ void distributeSpaceToTracks(Vector<GridTrack*>&, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, AccumulatorGetter, AccumulatorGrowFunction, GridSizingData&, LayoutUnit& availableLogicalSpace);

double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const;