Chromium Code Reviews| Index: Source/core/rendering/RenderMenuList.cpp |
| diff --git a/Source/core/rendering/RenderMenuList.cpp b/Source/core/rendering/RenderMenuList.cpp |
| index 7ca3e2cbac00382943c092af0ac12cd4fc6ed6ba..fc15c47ce27abf5e1a496b109e98254323db5726 100644 |
| --- a/Source/core/rendering/RenderMenuList.cpp |
| +++ b/Source/core/rendering/RenderMenuList.cpp |
| @@ -342,34 +342,6 @@ void RenderMenuList::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, |
| minLogicalWidth = maxLogicalWidth; |
| } |
| -void RenderMenuList::computePreferredLogicalWidths() |
| -{ |
| - m_minPreferredLogicalWidth = 0; |
| - 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 toAdd = borderAndPaddingWidth(); |
|
pdr.
2014/10/02 04:21:47
This is actually different but, as far as I can te
|
| - m_minPreferredLogicalWidth += toAdd; |
| - m_maxPreferredLogicalWidth += toAdd; |
| - |
| - clearPreferredLogicalWidthsDirty(); |
| -} |
| - |
| void RenderMenuList::showPopup() |
| { |
| if (m_popupIsVisible) |