Index: Source/platform/scroll/ScrollView.cpp |
diff --git a/Source/platform/scroll/ScrollView.cpp b/Source/platform/scroll/ScrollView.cpp |
index 89a599c02c8d01f5db18598bbbfad0a698fbf09b..521c54867df0165e04760f31020846a340281ca2 100644 |
--- a/Source/platform/scroll/ScrollView.cpp |
+++ b/Source/platform/scroll/ScrollView.cpp |
@@ -32,8 +32,6 @@ |
#include "platform/scroll/ScrollbarTheme.h" |
#include "wtf/StdLibExtras.h" |
-using namespace std; |
- |
namespace blink { |
ScrollView::ScrollView() |
@@ -187,8 +185,8 @@ IntSize ScrollView::excludeScrollbars(const IntSize& size) const |
if (Scrollbar* horizontalBar = horizontalScrollbar()) |
horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0; |
- return IntSize(max(0, size.width() - verticalScrollbarWidth), |
- max(0, size.height() - horizontalScrollbarHeight)); |
+ return IntSize(std::max(0, size.width() - verticalScrollbarWidth), |
+ std::max(0, size.height() - horizontalScrollbarHeight)); |
} |
@@ -543,7 +541,7 @@ void ScrollView::scrollContents(const IntSize& scrollDelta) |
if (m_drawPanScrollIcon) { |
// FIXME: the pan icon is broken when accelerated compositing is on, since it will draw under the compositing layers. |
// https://bugs.webkit.org/show_bug.cgi?id=47837 |
- int panIconDirtySquareSizeLength = 2 * (panIconSizeLength + max(abs(scrollDelta.width()), abs(scrollDelta.height()))); // We only want to repaint what's necessary |
+ int panIconDirtySquareSizeLength = 2 * (panIconSizeLength + std::max(abs(scrollDelta.width()), abs(scrollDelta.height()))); // We only want to repaint what's necessary |
IntPoint panIconDirtySquareLocation = IntPoint(m_panScrollIconPoint.x() - (panIconDirtySquareSizeLength / 2), m_panScrollIconPoint.y() - (panIconDirtySquareSizeLength / 2)); |
IntRect panScrollIconDirtyRect = IntRect(panIconDirtySquareLocation, IntSize(panIconDirtySquareSizeLength, panIconDirtySquareSizeLength)); |
panScrollIconDirtyRect.intersect(clipRect); |