| Index: third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
|
| index 5edb1e68e751d0af44db0aa2b863cb37821c21d6..33b3396768c221f18c824fd0b1321f59253cc33d 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
|
| @@ -119,8 +119,9 @@ void ConvolverHandler::setBuffer(AudioBuffer* buffer,
|
|
|
| if (!isChannelCountGood) {
|
| exceptionState.throwDOMException(
|
| - NotSupportedError, "The buffer must have 1, 2, or 4 channels, not " +
|
| - String::number(numberOfChannels));
|
| + NotSupportedError,
|
| + "The buffer must have 1, 2, or 4 channels, not " +
|
| + String::number(numberOfChannels));
|
| return;
|
| }
|
|
|
| @@ -156,10 +157,9 @@ AudioBuffer* ConvolverHandler::buffer() {
|
| double ConvolverHandler::tailTime() const {
|
| MutexTryLocker tryLocker(m_processLock);
|
| if (tryLocker.locked())
|
| - return m_reverb
|
| - ? m_reverb->impulseResponseLength() /
|
| - static_cast<double>(context()->sampleRate())
|
| - : 0;
|
| + return m_reverb ? m_reverb->impulseResponseLength() /
|
| + static_cast<double>(context()->sampleRate())
|
| + : 0;
|
| // Since we don't want to block the Audio Device thread, we return a large
|
| // value instead of trying to acquire the lock.
|
| return std::numeric_limits<double>::infinity();
|
| @@ -168,10 +168,9 @@ double ConvolverHandler::tailTime() const {
|
| double ConvolverHandler::latencyTime() const {
|
| MutexTryLocker tryLocker(m_processLock);
|
| if (tryLocker.locked())
|
| - return m_reverb
|
| - ? m_reverb->latencyFrames() /
|
| - static_cast<double>(context()->sampleRate())
|
| - : 0;
|
| + return m_reverb ? m_reverb->latencyFrames() /
|
| + static_cast<double>(context()->sampleRate())
|
| + : 0;
|
| // Since we don't want to block the Audio Device thread, we return a large
|
| // value instead of trying to acquire the lock.
|
| return std::numeric_limits<double>::infinity();
|
|
|