| Index: Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| diff --git a/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp b/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| index 390100ac202553667eb68504d7a254607da4c021..d035673d5d7834e92cf894f66de5c57682ce8829 100644
|
| --- a/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| +++ b/Source/core/rendering/RenderDeprecatedFlexibleBox.cpp
|
| @@ -215,35 +215,6 @@ void RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths(LayoutUnit& minL
|
| minLogicalWidth += scrollbarWidth;
|
| }
|
|
|
| -void RenderDeprecatedFlexibleBox::computePreferredLogicalWidths()
|
| -{
|
| - ASSERT(preferredLogicalWidthsDirty());
|
| -
|
| - m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0;
|
| - RenderStyle* styleToUse = style();
|
| -
|
| - if (styleToUse->width().isFixed() && styleToUse->width().value() > 0)
|
| - m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse->width().value());
|
| - else
|
| - computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
|
| -
|
| - if (styleToUse->minWidth().isFixed() && styleToUse->minWidth().value() > 0) {
|
| - m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->minWidth().value()));
|
| - m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->minWidth().value()));
|
| - }
|
| -
|
| - if (styleToUse->maxWidth().isFixed()) {
|
| - m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->maxWidth().value()));
|
| - m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->maxWidth().value()));
|
| - }
|
| -
|
| - LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
|
| - m_minPreferredLogicalWidth += borderAndPadding;
|
| - m_maxPreferredLogicalWidth += borderAndPadding;
|
| -
|
| - clearPreferredLogicalWidthsDirty();
|
| -}
|
| -
|
| void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren)
|
| {
|
| ASSERT(needsLayout());
|
|
|