Index: third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
index 707e6552585dab851c5d0dba84cf44018b8f6811..33f1bb6fa08f3396c977e112759552452ee922be 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp |
@@ -963,10 +963,6 @@ LayoutUnit LayoutDeprecatedFlexibleBox::allowedChildFlex(LayoutBox* child, bool |
LayoutUnit width = contentWidthForChild(child); |
if (child->style()->maxWidth().isFixed()) |
maxWidth = child->style()->maxWidth().value(); |
- else if (child->style()->maxWidth().type() == Intrinsic) |
- maxWidth = child->maxPreferredLogicalWidth(); |
- else if (child->style()->maxWidth().type() == MinIntrinsic) |
- maxWidth = child->minPreferredLogicalWidth(); |
if (maxWidth == LayoutUnit::max()) |
return maxWidth; |
return std::max<LayoutUnit>(0, maxWidth - width); |
@@ -987,10 +983,6 @@ LayoutUnit LayoutDeprecatedFlexibleBox::allowedChildFlex(LayoutBox* child, bool |
LayoutUnit width = contentWidthForChild(child); |
if (child->style()->minWidth().isFixed()) |
minWidth = child->style()->minWidth().value(); |
- else if (child->style()->minWidth().type() == Intrinsic) |
- minWidth = child->maxPreferredLogicalWidth(); |
- else if (child->style()->minWidth().type() == MinIntrinsic) |
- minWidth = child->minPreferredLogicalWidth(); |
else if (child->style()->minWidth().type() == Auto) |
minWidth = 0; |