| Index: Source/core/rendering/RenderScrollbarPart.cpp
|
| diff --git a/Source/core/rendering/RenderScrollbarPart.cpp b/Source/core/rendering/RenderScrollbarPart.cpp
|
| index 927079a1fdff09b7eba07e8f4eb25d91af3728e2..3a1fde123aa25bc76584d5dd8054a13eddc80811 100644
|
| --- a/Source/core/rendering/RenderScrollbarPart.cpp
|
| +++ b/Source/core/rendering/RenderScrollbarPart.cpp
|
| @@ -32,8 +32,6 @@
|
| #include "core/rendering/RenderView.h"
|
| #include "platform/LengthFunctions.h"
|
|
|
| -using namespace std;
|
| -
|
| namespace WebCore {
|
|
|
| RenderScrollbarPart::RenderScrollbarPart(RenderScrollbar* scrollbar, ScrollbarPart part)
|
| @@ -104,7 +102,7 @@ void RenderScrollbarPart::computeScrollbarWidth()
|
| int w = calcScrollbarThicknessUsing(MainOrPreferredSize, style()->width(), visibleSize);
|
| int minWidth = calcScrollbarThicknessUsing(MinSize, style()->minWidth(), visibleSize);
|
| int maxWidth = style()->maxWidth().isUndefined() ? w : calcScrollbarThicknessUsing(MaxSize, style()->maxWidth(), visibleSize);
|
| - setWidth(max(minWidth, min(maxWidth, w)));
|
| + setWidth(std::max(minWidth, std::min(maxWidth, w)));
|
|
|
| // Buttons and track pieces can all have margins along the axis of the scrollbar.
|
| m_marginBox.setLeft(minimumValueForLength(style()->marginLeft(), visibleSize));
|
| @@ -121,7 +119,7 @@ void RenderScrollbarPart::computeScrollbarHeight()
|
| int h = calcScrollbarThicknessUsing(MainOrPreferredSize, style()->height(), visibleSize);
|
| int minHeight = calcScrollbarThicknessUsing(MinSize, style()->minHeight(), visibleSize);
|
| int maxHeight = style()->maxHeight().isUndefined() ? h : calcScrollbarThicknessUsing(MaxSize, style()->maxHeight(), visibleSize);
|
| - setHeight(max(minHeight, min(maxHeight, h)));
|
| + setHeight(std::max(minHeight, std::min(maxHeight, h)));
|
|
|
| // Buttons and track pieces can all have margins along the axis of the scrollbar.
|
| m_marginBox.setTop(minimumValueForLength(style()->marginTop(), visibleSize));
|
|
|