Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
index 4a7cf2bec4aea4734f609106980cd3781dc085db..3cc0adb00f9e9df26135828d0947b8ecf1271794 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
@@ -1097,11 +1097,7 @@ LayoutUnit LayoutFlexibleBox::adjustChildSizeForMinAndMax(const LayoutBox& child |
// computeMainAxisExtentForChild can return -1 when the child has a percentage |
// min size, but we have an indefinite size in that axis. |
minExtent = std::max(LayoutUnit(), minExtent); |
- } else if (min.isAuto() && mainAxisOverflowForChild(child) == OverflowVisible && !(isColumnFlow() && child.isFlexibleBox())) { |
- // TODO(cbiesinger): For now, we do not handle min-height: auto for nested column flexboxes. We need |
- // to implement https://drafts.csswg.org/css-flexbox/#intrinsic-sizes before that produces |
- // reasonable results. Tracking bug: https://crbug.com/581553 |
- // css-flexbox section 4.5 |
+ } else if (min.isAuto() && mainAxisOverflowForChild(child) == OverflowVisible) { |
LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)); |
ASSERT(contentSize >= 0); |
if (hasAspectRatio(child) && child.intrinsicSize().height() > 0) |