| 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 3ad08c2f8690a0b53c26c12ddbb85d11157304f1..0bf81671d453f097ea087df6c0847636509b4e3f 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -3269,14 +3269,15 @@ LayoutUnit LayoutBox::computeReplacedLogicalWidth(
|
| LayoutUnit LayoutBox::computeReplacedLogicalWidthRespectingMinMaxWidth(
|
| LayoutUnit logicalWidth,
|
| ShouldComputePreferred shouldComputePreferred) const {
|
| - LayoutUnit minLogicalWidth = (shouldComputePreferred == ComputePreferred &&
|
| - style()->logicalMinWidth().isPercentOrCalc())
|
| - ? logicalWidth
|
| - : computeReplacedLogicalWidthUsing(
|
| - MinSize, style()->logicalMinWidth());
|
| + LayoutUnit minLogicalWidth =
|
| + shouldComputePreferred == ComputePreferred &&
|
| + style()->logicalMinWidth().isLayoutDependent()
|
| + ? logicalWidth
|
| + : computeReplacedLogicalWidthUsing(MinSize,
|
| + style()->logicalMinWidth());
|
| LayoutUnit maxLogicalWidth =
|
| (shouldComputePreferred == ComputePreferred &&
|
| - style()->logicalMaxWidth().isPercentOrCalc()) ||
|
| + style()->logicalMaxWidth().isLayoutDependent()) ||
|
| style()->logicalMaxWidth().isMaxSizeNone()
|
| ? logicalWidth
|
| : computeReplacedLogicalWidthUsing(MaxSize,
|
|
|