diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp b/chromium/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp index 83e6dba02ef..53cdd441f57 100644 --- a/chromium/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp +++ b/chromium/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp @@ -69,70 +69,47 @@ void AnalyserNode::process(size_t framesToProcess) outputBus->copyFrom(*inputBus); } -void AnalyserNode::reset() -{ - m_analyser.reset(); -} - void AnalyserNode::setFftSize(unsigned size, ExceptionState& exceptionState) { if (!m_analyser.setFftSize(size)) { exceptionState.throwDOMException( IndexSizeError, - ExceptionMessages::failedToSet( - "fftSize", - "AnalyserNode", - "FFT size (" + String::number(size) - + ") must be a power of two between " - + String::number(RealtimeAnalyser::MinFFTSize) + " and " - + String::number(RealtimeAnalyser::MaxFFTSize) + ", inclusive")); + (size < RealtimeAnalyser::MinFFTSize || size > RealtimeAnalyser::MaxFFTSize) ? + ExceptionMessages::indexOutsideRange("FFT size", size, RealtimeAnalyser::MinFFTSize, ExceptionMessages::InclusiveBound, RealtimeAnalyser::MaxFFTSize, ExceptionMessages::InclusiveBound) + : ("The value provided (" + String::number(size) + ") is not a power of two.")); } } -void AnalyserNode::setMinDecibels(float k, ExceptionState& exceptionState) +void AnalyserNode::setMinDecibels(double k, ExceptionState& exceptionState) { - if (k <= maxDecibels()) { + if (k < maxDecibels()) { m_analyser.setMinDecibels(k); } else { exceptionState.throwDOMException( IndexSizeError, - ExceptionMessages::failedToSet( - "minDecibels", - "AnalyserNode", - "minDecibels (" + String::number(k) - + ") must be less than or equal maxDecibels (" + String::number(maxDecibels()) - + ").")); + ExceptionMessages::indexExceedsMaximumBound("minDecibels", k, maxDecibels())); } } -void AnalyserNode::setMaxDecibels(float k, ExceptionState& exceptionState) +void AnalyserNode::setMaxDecibels(double k, ExceptionState& exceptionState) { - if (k >= minDecibels()) { + if (k > minDecibels()) { m_analyser.setMaxDecibels(k); } else { exceptionState.throwDOMException( IndexSizeError, - ExceptionMessages::failedToSet( - "maxDecibels", - "AnalyserNode", - "maxDecibels (" + String::number(k) - + ") must be greater than or equal minDecibels (" + String::number(minDecibels()) - + ").")); + ExceptionMessages::indexExceedsMinimumBound("maxDecibels", k, minDecibels())); } } -void AnalyserNode::setSmoothingTimeConstant(float k, ExceptionState& exceptionState) +void AnalyserNode::setSmoothingTimeConstant(double k, ExceptionState& exceptionState) { if (k >= 0 && k <= 1) { m_analyser.setSmoothingTimeConstant(k); } else { exceptionState.throwDOMException( IndexSizeError, - ExceptionMessages::failedToSet( - "smoothingTimeConstant", - "AnalyserNode", - "smoothing value (" + String::number(k) - + ") must be between 0 and 1, inclusive.")); + ExceptionMessages::indexOutsideRange("smoothing value", k, 0.0, ExceptionMessages::InclusiveBound, 1.0, ExceptionMessages::InclusiveBound)); } } |