Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1354)

Unified Diff: Source/platform/mac/ScrollAnimatorMac.mm

Issue 512293003: Removing "using" declarations that import names in the C++ Standard library.(Source/platform/[m* - … (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/platform/mac/ThemeMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « no previous file | Source/platform/mac/ThemeMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698