| Index: Source/platform/mac/ScrollAnimatorMac.mm
|
| diff --git a/Source/platform/mac/ScrollAnimatorMac.mm b/Source/platform/mac/ScrollAnimatorMac.mm
|
| index 857ff715763f7daef2e113d95d832a049a0f5a79..3c06aac6d4e3475e67238207d8f5c09ae0132280 100644
|
| --- a/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -42,7 +42,6 @@
|
| #include "wtf/PassOwnPtr.h"
|
|
|
| using namespace blink;
|
| -using namespace std;
|
|
|
| static bool supportsUIStateTransitionProgress()
|
| {
|
| @@ -687,8 +686,8 @@ FloatPoint ScrollAnimatorMac::adjustScrollPositionIfNecessary(const FloatPoint&
|
| IntPoint minPos = m_scrollableArea->minimumScrollPosition();
|
| IntPoint maxPos = m_scrollableArea->maximumScrollPosition();
|
|
|
| - float newX = max<float>(min<float>(position.x(), maxPos.x()), minPos.x());
|
| - float newY = max<float>(min<float>(position.y(), maxPos.y()), minPos.y());
|
| + float newX = std::max<float>(std::min<float>(position.x(), maxPos.x()), minPos.x());
|
| + float newY = std::max<float>(std::min<float>(position.y(), maxPos.y()), minPos.y());
|
|
|
| return FloatPoint(newX, newY);
|
| }
|
|
|