Index: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
index 405ec8ed26bcb40a429935678af58618593c03ba..1a9705ff93d8083cf897f6998ffd544a9ddb025c 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
@@ -287,21 +287,25 @@ void LayoutTextControl::computePreferredLogicalWidths() { |
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())); |
} |
if (styleToUse.logicalMaxWidth().isFixed()) { |
- m_maxPreferredLogicalWidth = std::min( |
- m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing( |
- styleToUse.logicalMaxWidth().value())); |
- m_minPreferredLogicalWidth = std::min( |
- m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing( |
- styleToUse.logicalMaxWidth().value())); |
+ m_maxPreferredLogicalWidth = |
+ std::min(m_maxPreferredLogicalWidth, |
+ adjustContentBoxLogicalWidthForBoxSizing( |
+ styleToUse.logicalMaxWidth().value())); |
+ m_minPreferredLogicalWidth = |
+ std::min(m_minPreferredLogicalWidth, |
+ adjustContentBoxLogicalWidthForBoxSizing( |
+ styleToUse.logicalMaxWidth().value())); |
} |
LayoutUnit toAdd = borderAndPaddingLogicalWidth(); |