diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 3c53d3e8d8..be0aa9d83a 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -4647,19 +4647,11 @@ nsFrame::SetCoordToFlexBasis(bool aIsInlineFlexItem, return; } + // Override whichever styleCoord is in the flex container's main axis if (aIsInlineFlexItem) { *aInlineStyle = aFlexBasis; } else { - // One caveat for vertical flex items: We don't support enumerated - // values (e.g. "max-content") for height properties yet. So, if our - // computed flex-basis is an enumerated value, we'll just behave as if - // it were "auto", which means "use the main-size property after all" - // (which is "height", in this case). - // NOTE: Once we support intrinsic sizing keywords for "height", - // we should remove this check. - if (aFlexBasis->GetUnit() != eStyleUnit_Enumerated) { - *aBlockStyle = aFlexBasis; - } + *aBlockStyle = aFlexBasis; } }