Source/core/rendering/RenderGrid.h - Issue 448993002: [CSSGridLayout] Skip items spanning flex tracks in track sizing algo

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 448993002: [CSSGridLayout] Skip items spanning flex tracks in track sizing algo (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 4 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/flex-and-content-sized-resolution-columns.html ('K') | « LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-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 1772c9a81fdccd941b3c670f3fe6e50031c97b70..ab5f23edf81fc450c48bf9cab4e2cd615f67efeb 100644

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

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

@@ -36,6 +36,8 @@ struct GridCoordinate;

struct GridSpan;

class GridTrack;

+typedef std::pair<RenderBox*, size_t> GridItemWithSpan;

class RenderGrid FINAL : public RenderBlock {

public:

RenderGrid(Element*);

@@ -94,7 +96,7 @@ private:

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

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

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

- void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, RenderBox*, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction);

+ void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, GridItemWithSpan&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction);

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

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