Source/core/rendering/RenderGrid.h - Issue 855643005: [CSS Grid Layout] Handling overflow on Content Alignment properties.

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 855643005: [CSS Grid Layout] Handling overflow on Content Alignment properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Applied suggested changes. 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

« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow-expected.txt ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
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 cec307afa723bd6156285e2651799dc317d63e6e..71f01d9b936258e50e688afeef4dab476239abe1 100644

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

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

@@ -124,8 +124,8 @@ private:

LayoutUnit endOfRowForChild(const RenderBox& child) const;

LayoutUnit centeredRowPositionForChild(const RenderBox&) const;

LayoutUnit rowPositionForChild(const RenderBox&) const;

- LayoutUnit contentPositionAndDistributionColumnOffset(LayoutUnit availableFreeSpace, ContentPosition, ContentDistributionType, unsigned numberOfItems) const;

- LayoutUnit contentPositionAndDistributionRowOffset(LayoutUnit availableFreeSpace, ContentPosition, ContentDistributionType, unsigned numberOfItems) const;

+ LayoutUnit contentPositionAndDistributionColumnOffset(LayoutUnit availableFreeSpace, ContentPosition, ContentDistributionType, OverflowAlignment, unsigned numberOfItems) const;

+ LayoutUnit contentPositionAndDistributionRowOffset(LayoutUnit availableFreeSpace, ContentPosition, ContentDistributionType, OverflowAlignment, unsigned numberOfItems) const;

LayoutPoint findChildLogicalPosition(const RenderBox&, LayoutSize contentAlignmentOffset) const;

GridCoordinate cachedGridCoordinate(const RenderBox&) const;