Index: Source/platform/scroll/ScrollbarThemeOverlay.cpp |
diff --git a/Source/platform/scroll/ScrollbarThemeOverlay.cpp b/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
index 21b84e16ffa5b6384a8e5127121ea337165a1fc8..a8a9556d992fea9853b8a3c861fbfe6e48233192 100644 |
--- a/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
+++ b/Source/platform/scroll/ScrollbarThemeOverlay.cpp |
@@ -36,8 +36,6 @@ |
#include <algorithm> |
-using namespace std; |
- |
namespace blink { |
ScrollbarThemeOverlay::ScrollbarThemeOverlay(int thumbThickness, int scrollbarMargin, HitTestBehavior allowHitTest, Color color) |
@@ -88,7 +86,7 @@ int ScrollbarThemeOverlay::thumbLength(ScrollbarThemeClient* scrollbar) |
float proportion = static_cast<float>(scrollbar->visibleSize()) / scrollbar->totalSize(); |
int length = round(proportion * trackLen); |
- length = min(max(length, minimumThumbLength(scrollbar)), trackLen); |
+ length = std::min(std::max(length, minimumThumbLength(scrollbar)), trackLen); |
return length; |
} |