third_party/WebKit/Source/core/layout/LayoutGrid.h - Issue 1854623002: [css-grid] Use the margin box for non auto minimum sizes

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: third_party/WebKit/Source/core/layout/LayoutGrid.h

Issue 1854623002: [css-grid] Use the margin box for non auto minimum sizes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Patch for landing Created 4 years, 8 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 | « third_party/WebKit/LayoutTests/fast/css-grid-layout/min-width-margin-box.html ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 742eaa859376472872daaa4def93e7e7fc7176e8..b9d3209c63158ce822ff4335521040e4323cb20b 100644

--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h

+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h

@@ -148,6 +148,7 @@ private:

GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t) const;

+ bool updateOverrideContainingBlockContentLogicalWidthForChild(LayoutBox&, GridSizingData&);

LayoutUnit logicalHeightForChild(LayoutBox&, GridSizingData&);

LayoutUnit minSizeForChild(LayoutBox&, GridTrackSizingDirection, GridSizingData&);

LayoutUnit minContentForChild(LayoutBox&, GridTrackSizingDirection, GridSizingData&);

@@ -169,7 +170,7 @@ private:

void paintChildren(const PaintInfo&, const LayoutPoint&) const override;

LayoutUnit marginLogicalHeightForChild(const LayoutBox&) const;

- LayoutUnit computeMarginLogicalHeightForChild(const LayoutBox&) const;

+ LayoutUnit computeMarginLogicalSizeForChild(MarginDirection, const LayoutBox&) const;

LayoutUnit availableAlignmentSpaceForChildBeforeStretching(LayoutUnit gridAreaBreadthForChild, const LayoutBox&) const;

void applyStretchAlignmentToChildIfNeeded(LayoutBox&);

bool hasAutoMarginsInColumnAxis(const LayoutBox&) const;