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

Unified Diff: Source/modules/webaudio/AudioScheduledSourceNode.cpp

Issue 363613003: Removing using declarations that import names in the C++ Standard library. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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/modules/webaudio/AudioParamTimeline.cpp ('k') | Source/modules/webaudio/AudioSummingJunction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webaudio/AudioScheduledSourceNode.cpp
diff --git a/Source/modules/webaudio/AudioScheduledSourceNode.cpp b/Source/modules/webaudio/AudioScheduledSourceNode.cpp
index e96f2c89ff98edda428022b0b1bea5ad5402935c..35c3cf915dda820e553b334c2a40956472f1fcbb 100644
--- a/Source/modules/webaudio/AudioScheduledSourceNode.cpp
+++ b/Source/modules/webaudio/AudioScheduledSourceNode.cpp
@@ -36,8 +36,6 @@
#include <algorithm>
#include "wtf/MathExtras.h"
-using namespace std;
-
namespace WebCore {
const double AudioScheduledSourceNode::UnknownTime = -1;
@@ -93,7 +91,7 @@ void AudioScheduledSourceNode::updateSchedulingInfo(size_t quantumFrameSize,
}
quantumFrameOffset = startFrame > quantumStartFrame ? startFrame - quantumStartFrame : 0;
- quantumFrameOffset = min(quantumFrameOffset, quantumFrameSize); // clamp to valid range
+ quantumFrameOffset = std::min(quantumFrameOffset, quantumFrameSize); // clamp to valid range
nonSilentFramesToProcess = quantumFrameSize - quantumFrameOffset;
if (!nonSilentFramesToProcess) {
@@ -162,7 +160,7 @@ void AudioScheduledSourceNode::stop(double when, ExceptionState& exceptionState)
// stop() can be called more than once, with the last call to stop taking effect, unless the
// source has already stopped due to earlier calls to stop. No exceptions are thrown in any
// case.
- when = max(0.0, when);
+ when = std::max(0.0, when);
m_endTime = when;
}
}
« no previous file with comments | « Source/modules/webaudio/AudioParamTimeline.cpp ('k') | Source/modules/webaudio/AudioSummingJunction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698