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

Unified Diff: Source/platform/scroll/ScrollAnimatorNone.cpp

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 | « Source/platform/scroll/ScrollAnimator.cpp ('k') | Source/platform/scroll/ScrollView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/ScrollAnimatorNone.cpp
diff --git a/Source/platform/scroll/ScrollAnimatorNone.cpp b/Source/platform/scroll/ScrollAnimatorNone.cpp
index 6d82cfe1f4bfa1fb187169cb55fe6960ee7835a2..d018d53809e6ae85a33f00309267d1aa0795f4d3 100644
--- a/Source/platform/scroll/ScrollAnimatorNone.cpp
+++ b/Source/platform/scroll/ScrollAnimatorNone.cpp
@@ -39,8 +39,6 @@
#include "platform/TraceEvent.h"
-using namespace std;
-
namespace blink {
const double kFrameRate = 60;
@@ -146,12 +144,12 @@ double ScrollAnimatorNone::PerAxisData::curveIntegralAt(Curve curve, double t)
const double kTimeBaseSquared = kTimeBase * kTimeBase;
const double kTimeBaseSquaredOverThree = kTimeBaseSquared / 3;
double area;
- double t1 = min(t, 1 / kTimeBase);
+ double t1 = std::min(t, 1 / kTimeBase);
area = kTimeBaseSquaredOverThree * t1 * t1 * t1;
if (t < 1 / kTimeBase)
return area;
- t1 = min(t - 1 / kTimeBase, 1 / kTimeBase);
+ t1 = std::min(t - 1 / kTimeBase, 1 / kTimeBase);
// The integral of kTimeBaseSquared * (t1 - .5 / kTimeBase) * (t1 - .5 / kTimeBase) + kParabolaAtEdge
const double kSecondInnerOffset = kTimeBaseSquared * .5 / kTimeBase;
double bounceArea = t1 * (t1 * (kTimeBaseSquaredOverThree * t1 - kSecondInnerOffset) + 1);
@@ -159,7 +157,7 @@ double ScrollAnimatorNone::PerAxisData::curveIntegralAt(Curve curve, double t)
if (t < 2 / kTimeBase)
return area;
- t1 = min(t - 2 / kTimeBase, 0.5 / kTimeBase);
+ t1 = std::min(t - 2 / kTimeBase, 0.5 / kTimeBase);
// The integral of kTimeBaseSquared * (t1 - .25 / kTimeBase) * (t1 - .25 / kTimeBase) + kParabolaAtEdge
const double kThirdInnerOffset = kTimeBaseSquared * .25 / kTimeBase;
bounceArea = t1 * (t1 * (kTimeBaseSquaredOverThree * t1 - kThirdInnerOffset) + 1);
@@ -233,7 +231,7 @@ bool ScrollAnimatorNone::PerAxisData::updateDataFromParameters(float step, float
float newPosition = m_desiredPosition + pixelDelta;
if (newPosition < 0 || newPosition > scrollableSize)
- newPosition = max(min(newPosition, scrollableSize), 0.0f);
+ newPosition = std::max(std::min(newPosition, scrollableSize), 0.0f);
if (newPosition == m_desiredPosition)
return false;
@@ -268,9 +266,9 @@ bool ScrollAnimatorNone::PerAxisData::updateDataFromParameters(float step, float
double attackAreaLeft = 0;
double deltaTime = m_lastAnimationTime - m_startTime;
- double attackTimeLeft = max(0., m_attackTime - deltaTime);
+ double attackTimeLeft = std::max(0., m_attackTime - deltaTime);
double timeLeft = m_animationTime - deltaTime;
- double minTimeLeft = m_releaseTime + min(parameters->m_repeatMinimumSustainTime, m_animationTime - m_releaseTime - attackTimeLeft);
+ double minTimeLeft = m_releaseTime + std::min(parameters->m_repeatMinimumSustainTime, m_animationTime - m_releaseTime - attackTimeLeft);
if (timeLeft < minTimeLeft) {
m_animationTime = deltaTime + minTimeLeft;
timeLeft = minTimeLeft;
@@ -283,14 +281,14 @@ bool ScrollAnimatorNone::PerAxisData::updateDataFromParameters(float step, float
if (fabs(remainingDelta) > minCoastDelta) {
double maxCoastDelta = parameters->m_maximumCoastTime * targetMaxCoastVelocity;
- double coastFactor = min(1., (fabs(remainingDelta) - minCoastDelta) / (maxCoastDelta - minCoastDelta));
+ double coastFactor = std::min(1., (fabs(remainingDelta) - minCoastDelta) / (maxCoastDelta - minCoastDelta));
// We could play with the curve here - linear seems a little soft. Initial testing makes me want to feed into the sustain time more aggressively.
- double coastMinTimeLeft = min(parameters->m_maximumCoastTime, minTimeLeft + coastCurve(parameters->m_coastTimeCurve, coastFactor) * (parameters->m_maximumCoastTime - minTimeLeft));
+ double coastMinTimeLeft = std::min(parameters->m_maximumCoastTime, minTimeLeft + coastCurve(parameters->m_coastTimeCurve, coastFactor) * (parameters->m_maximumCoastTime - minTimeLeft));
- double additionalTime = max(0., coastMinTimeLeft - minTimeLeft);
+ double additionalTime = std::max(0., coastMinTimeLeft - minTimeLeft);
if (additionalTime) {
- double additionalReleaseTime = min(additionalTime, parameters->m_releaseTime / (parameters->m_releaseTime + parameters->m_repeatMinimumSustainTime) * additionalTime);
+ double additionalReleaseTime = std::min(additionalTime, parameters->m_releaseTime / (parameters->m_releaseTime + parameters->m_repeatMinimumSustainTime) * additionalTime);
m_releaseTime = parameters->m_releaseTime + additionalReleaseTime;
m_animationTime = deltaTime + coastMinTimeLeft;
timeLeft = coastMinTimeLeft;
@@ -298,8 +296,8 @@ bool ScrollAnimatorNone::PerAxisData::updateDataFromParameters(float step, float
}
}
- double releaseTimeLeft = min(timeLeft, m_releaseTime);
- double sustainTimeLeft = max(0., timeLeft - releaseTimeLeft - attackTimeLeft);
+ double releaseTimeLeft = std::min(timeLeft, m_releaseTime);
+ double sustainTimeLeft = std::max(0., timeLeft - releaseTimeLeft - attackTimeLeft);
if (attackTimeLeft) {
double attackSpot = deltaTime / m_attackTime;
« no previous file with comments | « Source/platform/scroll/ScrollAnimator.cpp ('k') | Source/platform/scroll/ScrollView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698