Index: third_party/WebKit/Source/core/layout/LayoutTable.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutTable.cpp b/third_party/WebKit/Source/core/layout/LayoutTable.cpp |
index 8fe7915e8d13aff402156369d90456157cb382ed..8a8c110f4b8a67df82f03f4a139c605be0ec81ef 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutTable.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutTable.cpp |
@@ -903,12 +903,14 @@ void LayoutTable::computePreferredLogicalWidths() { |
// 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())); |
+ 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 |
@@ -916,9 +918,10 @@ void LayoutTable::computePreferredLogicalWidths() { |
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); |
} |
@@ -1383,8 +1386,9 @@ LayoutTableSection* LayoutTable::sectionAbove( |
section == m_foot ? lastChild() : section->previousSibling(); |
while (prevSection) { |
if (prevSection->isTableSection() && prevSection != m_head && |
- prevSection != m_foot && (skipEmptySections == DoNotSkipEmptySections || |
- toLayoutTableSection(prevSection)->numRows())) |
+ prevSection != m_foot && |
+ (skipEmptySections == DoNotSkipEmptySections || |
+ toLayoutTableSection(prevSection)->numRows())) |
break; |
prevSection = prevSection->previousSibling(); |
} |
@@ -1406,8 +1410,9 @@ LayoutTableSection* LayoutTable::sectionBelow( |
section == m_head ? firstChild() : section->nextSibling(); |
while (nextSection) { |
if (nextSection->isTableSection() && nextSection != m_head && |
- nextSection != m_foot && (skipEmptySections == DoNotSkipEmptySections || |
- toLayoutTableSection(nextSection)->numRows())) |
+ nextSection != m_foot && |
+ (skipEmptySections == DoNotSkipEmptySections || |
+ toLayoutTableSection(nextSection)->numRows())) |
break; |
nextSection = nextSection->nextSibling(); |
} |