| Index: Source/core/rendering/RenderTextControl.cpp
|
| diff --git a/Source/core/rendering/RenderTextControl.cpp b/Source/core/rendering/RenderTextControl.cpp
|
| index 81369e99415c863c5bcfbb38ba8c45fdd5887862..e49037c3a4014c64f94be59afc2dced190a08264 100644
|
| --- a/Source/core/rendering/RenderTextControl.cpp
|
| +++ b/Source/core/rendering/RenderTextControl.cpp
|
| @@ -28,8 +28,6 @@
|
| #include "platform/scroll/ScrollbarTheme.h"
|
| #include "wtf/unicode/CharacterNames.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| RenderTextControl::RenderTextControl(HTMLTextFormControlElement* element)
|
| @@ -268,13 +266,13 @@ void RenderTextControl::computePreferredLogicalWidths()
|
| computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
|
|
|
| if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0) {
|
| - m_maxPreferredLogicalWidth = max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
|
| - m_minPreferredLogicalWidth = 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 = min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
|
| - m_minPreferredLogicalWidth = 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();
|
|
|