| Index: third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
|
| index ecdecdbc15be26daa6a123ea6b339d1358b5f79b..453d8b2145886f0cdc637247caf7a38f929cf5ba 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
|
| @@ -66,12 +66,12 @@ void ChannelMergerHandler::process(size_t framesToProcess)
|
| ASSERT_UNUSED(framesToProcess, framesToProcess == output.bus()->length());
|
|
|
| unsigned numberOfOutputChannels = output.numberOfChannels();
|
| - ASSERT(numberOfInputs() == numberOfOutputChannels);
|
| + DCHECK(numberOfInputs() == numberOfOutputChannels);
|
|
|
| // Merge multiple inputs into one output.
|
| for (unsigned i = 0; i < numberOfOutputChannels; ++i) {
|
| AudioNodeInput& input = this->input(i);
|
| - ASSERT(input.numberOfChannels() == 1);
|
| + DCHECK_EQ(static_cast<int>(input.numberOfChannels()), 1);
|
| AudioChannel* outputChannel = output.bus()->channel(i);
|
| if (input.isConnected()) {
|
|
|
| @@ -93,7 +93,7 @@ void ChannelMergerHandler::process(size_t framesToProcess)
|
|
|
| void ChannelMergerHandler::setChannelCount(unsigned long channelCount, ExceptionState& exceptionState)
|
| {
|
| - ASSERT(isMainThread());
|
| + DCHECK(isMainThread());
|
| AbstractAudioContext::AutoLocker locker(context());
|
|
|
| // channelCount must be 1.
|
| @@ -106,7 +106,7 @@ void ChannelMergerHandler::setChannelCount(unsigned long channelCount, Exception
|
|
|
| void ChannelMergerHandler::setChannelCountMode(const String& mode, ExceptionState& exceptionState)
|
| {
|
| - ASSERT(isMainThread());
|
| + DCHECK(isMainThread());
|
| AbstractAudioContext::AutoLocker locker(context());
|
|
|
| // channcelCountMode must be 'explicit'.
|
|
|