Source/core/rendering/RenderBox.cpp - Issue 613273002: [CSS Grid Layout] Stretch value for align and justify 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/RenderBox.cpp

Issue 613273002: [CSS Grid Layout] Stretch value for align and justify properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Added specific layout test. Created 6 years, 3 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-align-justify-stretch.html ('K') | « LayoutTests/fast/css-grid-layout/justify-self-cell.html ('k') | Source/core/rendering/RenderGrid.h » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBox.cpp

diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp

index cbf845eeec867fd21201069da18e0925d358e567..c38831f69b75514c57e01098c3f003ab8e393fbe 100644

--- a/Source/core/rendering/RenderBox.cpp

+++ b/Source/core/rendering/RenderBox.cpp

@@ -2242,7 +2242,7 @@ void RenderBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logica

// grab our cached flexible height.

// FIXME: Account for block-flow in flexible boxes.

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

- if (hasOverrideHeight() && parent()->isFlexibleBoxIncludingDeprecated())

+ if (hasOverrideHeight() && (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isRenderGrid()))

h = Length(overrideLogicalContentHeight(), Fixed);

else if (treatAsReplaced)

h = Length(computeReplacedLogicalHeight(), Fixed);