Chromium Code Reviews| 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..5f043ff223db3c8adb4fa4116d26d6a9992477dc 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())) { |
|
leviw_travelin_and_unemployed
2016/01/27 00:18:30
*Sigh*
This sucks, but I agree with it as a banda
|
| + // 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. |
|
leviw_travelin_and_unemployed
2016/01/27 00:18:30
Tracking bug?
cbiesinger
2016/01/27 00:25:08
Done.
|
| // css-flexbox section 4.5 |
| LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)); |
| ASSERT(contentSize >= 0); |