| Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| index 144d3bc98ec11a18da1d91554024518da67c29b2..b3bf9b05a984d1c5d3aafd1af69ca85b468ff816 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
|
| @@ -435,7 +435,7 @@ void LayoutGrid::layoutBlock(bool relayoutChildren)
|
| LayoutSize previousSize = size();
|
|
|
| updateLogicalWidth();
|
| - bool logicalHeightWasIndefinite = computeContentLogicalHeight(MainOrPreferredSize, style()->logicalHeight(), LayoutUnit(-1)) == LayoutUnit(-1);
|
| + bool logicalHeightWasIndefinite = !hasDefiniteLogicalHeight();
|
|
|
| TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope);
|
|
|
| @@ -1394,7 +1394,7 @@ size_t LayoutGrid::computeAutoRepeatTracksCount(GridTrackSizingDirection directi
|
| if (isRowAxis) {
|
| availableSize = sizingOperation == IntrinsicSizeComputation ? LayoutUnit(-1) : availableLogicalWidth();
|
| } else {
|
| - availableSize = computeContentLogicalHeight(MainOrPreferredSize, styleRef().logicalHeight(), LayoutUnit(-1));
|
| + availableSize = availableLogicalHeightForPercentageComputation();
|
| if (availableSize == -1) {
|
| const Length& maxLength = styleRef().logicalMaxHeight();
|
| if (!maxLength.isMaxSizeNone())
|
|
|