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

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

Issue 2104123002: [css-flexbox] childIntrinsicWidth needs to actually return the intrinsic width (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: had to make this more similar to childIntrinsicHeight to fix tests Created 4 years, 6 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/wrapping-column-dynamic-changes.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 7e2becde31d1c2cfad97cc4ed0bdaad29c3d9942..a6a1db68676a4229937e685667849be1d328e084 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -476,7 +476,10 @@ LayoutUnit LayoutFlexibleBox::childIntrinsicWidth(const LayoutBox& child) const
{
if (!child.isHorizontalWritingMode() && needToStretchChildLogicalHeight(child))
return constrainedChildIntrinsicContentLogicalHeight(child);
- // TOOO(cbiesinger): should this return the maxPreferredLogicalWidth?
+ if (child.isHorizontalWritingMode() && child.styleRef().width().isAuto()) {
+ // This value is already clamped by min/max-width
+ return child.maxPreferredLogicalWidth();
+ }
return child.size().width();
}
« no previous file with comments | « third_party/WebKit/LayoutTests/css3/flexbox/wrapping-column-dynamic-changes.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698