Chromium Code Reviews| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp |
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
| index eadfef9c82765fe03c6eccf06e10c2f8e1529a44..a7bb9c71841aebc0d17a8903b7ce6b8fa17c6985 100644 |
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
| @@ -3250,13 +3250,17 @@ LayoutUnit LayoutBox::computeReplacedLogicalWidthRespectingMinMaxWidth( |
| LayoutUnit logicalWidth, |
| ShouldComputePreferred shouldComputePreferred) const { |
| LayoutUnit minLogicalWidth = (shouldComputePreferred == ComputePreferred && |
| - style()->logicalMinWidth().isPercentOrCalc()) |
| + (style()->logicalMinWidth().isPercentOrCalc() || |
| + style()->logicalMinWidth().isFitContent() || |
| + style()->logicalMinWidth().isFillAvailable())) |
| ? logicalWidth |
| : computeReplacedLogicalWidthUsing( |
| MinSize, style()->logicalMinWidth()); |
| LayoutUnit maxLogicalWidth = |
| (shouldComputePreferred == ComputePreferred && |
| - style()->logicalMaxWidth().isPercentOrCalc()) || |
| + (style()->logicalMaxWidth().isPercentOrCalc() || |
| + style()->logicalMaxWidth().isFitContent() || |
| + style()->logicalMaxWidth().isFillAvailable())) || |
|
mstensho (USE GERRIT)
2016/11/10 19:54:25
So, what's a good term to use when you're either p
jfernandez
2016/11/10 20:54:39
If I manage to do something very simple, I think i
|
| style()->logicalMaxWidth().isMaxSizeNone() |
| ? logicalWidth |
| : computeReplacedLogicalWidthUsing(MaxSize, |