| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| index 9137ecf1dc9429612d281307f6f2dbf45e1b35a7..f760f4c05c473670efff8a3d7e8f2dba5f5de787 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -2733,6 +2733,8 @@ LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const
|
| availableHeight = stretchedFlexHeight;
|
| } else if (hasOverrideContainingBlockLogicalHeight() && !isOutOfFlowPositionedWithSpecifiedHeight) {
|
| availableHeight = overrideContainingBlockContentLogicalHeight();
|
| + } else if (cb->isGridItem() && cb->hasOverrideLogicalContentHeight()) {
|
| + availableHeight = cb->overrideLogicalContentHeight();
|
| } else if (cbstyle.logicalHeight().isFixed()) {
|
| LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle.logicalHeight().value());
|
| availableHeight = cb->constrainContentBoxLogicalHeightByMinMax(
|
|
|