| Index: Source/core/layout/LayoutTable.cpp
|
| diff --git a/Source/core/layout/LayoutTable.cpp b/Source/core/layout/LayoutTable.cpp
|
| index 224e1115399565b3219678411cfdc1985341f393..f3193b9c686d001976bfef49664983393694d26d 100644
|
| --- a/Source/core/layout/LayoutTable.cpp
|
| +++ b/Source/core/layout/LayoutTable.cpp
|
| @@ -688,17 +688,17 @@ void LayoutTable::computePreferredLogicalWidths()
|
| for (unsigned i = 0; i < m_captions.size(); i++)
|
| m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, m_captions[i]->minPreferredLogicalWidth());
|
|
|
| - LayoutStyle* styleToUse = style();
|
| + const LayoutStyle& styleToUse = styleRef();
|
| // FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for min-width.
|
| - if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0) {
|
| - m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
|
| - m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
|
| + if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
|
| + m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
|
| + m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
|
| }
|
|
|
| // FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for maxWidth.
|
| - if (styleToUse->logicalMaxWidth().isFixed()) {
|
| + if (styleToUse.logicalMaxWidth().isFixed()) {
|
| // We don't constrain m_minPreferredLogicalWidth as the table should be at least the size of its min-content, regardless of 'max-width'.
|
| - m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
|
| + m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth().value()));
|
| m_maxPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
|
| }
|
|
|
|
|