Index: third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp |
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp |
index 090af4fb4db370449e63595a7cb6239828f79078..db216895790e4502d8089ac493c542c47c503ab6 100644 |
--- a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp |
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp |
@@ -45,7 +45,7 @@ std::unique_ptr<AudioNodeInput> AudioNodeInput::create(AudioHandler& handler) |
void AudioNodeInput::connect(AudioNodeOutput& output) |
{ |
- ASSERT(deferredTaskHandler().isGraphOwner()); |
+ DCHECK(deferredTaskHandler().isGraphOwner()); |
// Check if we're already connected to this output. |
if (m_outputs.contains(&output)) |
@@ -58,7 +58,7 @@ void AudioNodeInput::connect(AudioNodeOutput& output) |
void AudioNodeInput::disconnect(AudioNodeOutput& output) |
{ |
- ASSERT(deferredTaskHandler().isGraphOwner()); |
+ DCHECK(deferredTaskHandler().isGraphOwner()); |
// First try to disconnect from "active" connections. |
if (m_outputs.contains(&output)) { |
@@ -84,8 +84,8 @@ void AudioNodeInput::disconnect(AudioNodeOutput& output) |
void AudioNodeInput::disable(AudioNodeOutput& output) |
{ |
- ASSERT(deferredTaskHandler().isGraphOwner()); |
- ASSERT(m_outputs.contains(&output)); |
+ DCHECK(deferredTaskHandler().isGraphOwner()); |
+ DCHECK(m_outputs.contains(&output)); |
m_disabledOutputs.add(&output); |
m_outputs.remove(&output); |
@@ -97,8 +97,8 @@ void AudioNodeInput::disable(AudioNodeOutput& output) |
void AudioNodeInput::enable(AudioNodeOutput& output) |
{ |
- ASSERT(deferredTaskHandler().isGraphOwner()); |
- ASSERT(m_disabledOutputs.contains(&output)); |
+ DCHECK(deferredTaskHandler().isGraphOwner()); |
+ DCHECK(m_disabledOutputs.contains(&output)); |
// Move output from disabled list to active list. |
m_outputs.add(&output); |
@@ -116,8 +116,8 @@ void AudioNodeInput::didUpdate() |
void AudioNodeInput::updateInternalBus() |
{ |
- ASSERT(deferredTaskHandler().isAudioThread()); |
- ASSERT(deferredTaskHandler().isGraphOwner()); |
+ DCHECK(deferredTaskHandler().isAudioThread()); |
+ DCHECK(deferredTaskHandler().isGraphOwner()); |
unsigned numberOfInputChannels = numberOfChannels(); |
@@ -150,7 +150,7 @@ unsigned AudioNodeInput::numberOfChannels() const |
AudioBus* AudioNodeInput::bus() |
{ |
- ASSERT(deferredTaskHandler().isAudioThread()); |
+ DCHECK(deferredTaskHandler().isAudioThread()); |
// Handle single connection specially to allow for in-place processing. |
if (numberOfRenderingConnections() == 1 && handler().internalChannelCountMode() == AudioHandler::Max) |
@@ -162,19 +162,20 @@ AudioBus* AudioNodeInput::bus() |
AudioBus* AudioNodeInput::internalSummingBus() |
{ |
- ASSERT(deferredTaskHandler().isAudioThread()); |
+ DCHECK(deferredTaskHandler().isAudioThread()); |
return m_internalSummingBus.get(); |
} |
void AudioNodeInput::sumAllConnections(AudioBus* summingBus, size_t framesToProcess) |
{ |
- ASSERT(deferredTaskHandler().isAudioThread()); |
+ DCHECK(deferredTaskHandler().isAudioThread()); |
// We shouldn't be calling this method if there's only one connection, since it's less efficient. |
- ASSERT(numberOfRenderingConnections() > 1 || handler().internalChannelCountMode() != AudioHandler::Max); |
+ DCHECK_GT(numberOfRenderingConnections(), 1u); |
+ DCHECK_NE(handler().internalChannelCountMode(), AudioHandler::Max); |
- ASSERT(summingBus); |
+ DCHECK(summingBus); |
if (!summingBus) |
return; |
@@ -184,7 +185,7 @@ void AudioNodeInput::sumAllConnections(AudioBus* summingBus, size_t framesToProc |
for (unsigned i = 0; i < numberOfRenderingConnections(); ++i) { |
AudioNodeOutput* output = renderingOutput(i); |
- ASSERT(output); |
+ DCHECK(output); |
// Render audio from this output. |
AudioBus* connectionBus = output->pull(0, framesToProcess); |
@@ -196,7 +197,7 @@ void AudioNodeInput::sumAllConnections(AudioBus* summingBus, size_t framesToProc |
AudioBus* AudioNodeInput::pull(AudioBus* inPlaceBus, size_t framesToProcess) |
{ |
- ASSERT(deferredTaskHandler().isAudioThread()); |
+ DCHECK(deferredTaskHandler().isAudioThread()); |
// Handle single connection case. |
if (numberOfRenderingConnections() == 1 && handler().internalChannelCountMode() == AudioHandler::Max) { |