| Index: Source/platform/scroll/Scrollbar.cpp
|
| diff --git a/Source/platform/scroll/Scrollbar.cpp b/Source/platform/scroll/Scrollbar.cpp
|
| index 2d8ccdfdc08d52ddfcc59e4ff9ff21dcbe73c71c..afea041f44173813c64cf9b4ceed4761658d1b6f 100644
|
| --- a/Source/platform/scroll/Scrollbar.cpp
|
| +++ b/Source/platform/scroll/Scrollbar.cpp
|
| @@ -35,8 +35,6 @@
|
| #include "platform/scroll/ScrollableArea.h"
|
| #include "platform/scroll/ScrollbarTheme.h"
|
|
|
| -using namespace std;
|
| -
|
| #if ((OS(POSIX) && !OS(MACOSX)) || OS(WIN))
|
| // The position of the scrollbar thumb affects the appearance of the steppers, so
|
| // when the thumb moves, we have to invalidate them for painting.
|
| @@ -302,9 +300,9 @@ void Scrollbar::moveThumb(int pos, bool draggingDocument)
|
| int thumbLen = theme()->thumbLength(this);
|
| int trackLen = theme()->trackLength(this);
|
| if (delta > 0)
|
| - delta = min(trackLen - thumbLen - thumbPos, delta);
|
| + delta = std::min(trackLen - thumbLen - thumbPos, delta);
|
| else if (delta < 0)
|
| - delta = max(-thumbPos, delta);
|
| + delta = std::max(-thumbPos, delta);
|
|
|
| float minPos = m_scrollableArea->minimumScrollPosition(m_orientation);
|
| float maxPos = m_scrollableArea->maximumScrollPosition(m_orientation);
|
|
|