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 3d90d7938790bc1fe97bd44aca3f750dc5b9ec5e..f735ab00a391df20b08aabec6cc348f1ae456e59 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp |
@@ -912,7 +912,10 @@ 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) == OVISIBLE) { |
+ } else if (min.isAuto() && mainAxisOverflowForChild(child) == OVISIBLE && !(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 |
LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)); |
ASSERT(contentSize >= 0); |