Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

Issue 2157093002: [css-flexbox] Apply min-height: auto to nested flexboxes again (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698