Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / audio / AudioDelayDSPKernel.cpp

diff --git a/src/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp b/src/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
index 326a700..861ac9b 100644 (file)
--- a/src/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
+++ b/src/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
@@ -32,8 +32,6 @@
 #include "wtf/MathExtras.h"
 #include <algorithm>
 
-using namespace std;
-
 namespace blink {
 
 const float SmoothingTimeConstant = 0.020f; // 20ms
@@ -115,8 +113,8 @@ void AudioDelayDSPKernel::process(const float* source, float* destination, size_
         delayTime = this->delayTime(sampleRate);
 
         // Make sure the delay time is in a valid range.
-        delayTime = min(maxTime, delayTime);
-        delayTime = max(0.0, delayTime);
+        delayTime = std::min(maxTime, delayTime);
+        delayTime = std::max(0.0, delayTime);
 
         if (m_firstTime) {
             m_currentDelayTime = delayTime;