Source/core/layout/LayoutBox.cpp - Issue 1228983003: [CSS Grid Layout] Do not stretch always grid items with auto width

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/layout/LayoutBox.cpp

Issue 1228983003: [CSS Grid Layout] Do not stretch always grid items with auto width (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Applied additional suggested changes. Created 5 years, 5 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/min-width-height-auto.html ('K') | « LayoutTests/fast/css-grid-layout/relayout-justify-self-changed-expected.txt ('k') | Source/core/layout/LayoutGrid.h » ('j') | Source/core/layout/LayoutGrid.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutBox.cpp

diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp

index 6a23fcf4517e4c403925ffc44baee5af0140e89e..6adfcae771d8e96465603aaa864edbcdf2304528 100644

--- a/Source/core/layout/LayoutBox.cpp

+++ b/Source/core/layout/LayoutBox.cpp

@@ -1933,7 +1933,7 @@ void LayoutBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)

// width. Use the width from the style context.

// FIXME: Account for writing-mode in flexible boxes.

// https://bugs.webkit.org/show_bug.cgi?id=46418

- if (hasOverrideLogicalContentWidth() && parent()->isFlexibleBoxIncludingDeprecated()) {

+ if (hasOverrideLogicalContentWidth() && (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isLayoutGrid())) {

computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddingLogicalWidth();

return;

}