Replace ASSERT with DCHECK in WebAudio

third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp

Index: third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
index 0a26595c00cddddf01dac6111c45d0d3c5b654e6..86c6139f9d775f49e14492a9b79f5605932a16ee 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
@@ -37,9 +37,7 @@ inline AudioNodeOutput::AudioNodeOutput(AudioHandler* handler, unsigned numberOf
     , m_desiredNumberOfChannels(numberOfChannels)
     , m_isInPlace(false)
     , m_isEnabled(true)
-#if ENABLE_ASSERT
     , m_didCallDispose(false)
-#endif
     , m_renderingFanOutCount(0)
     , m_renderingParamFanOutCount(0)
 {
@@ -55,19 +53,18 @@ std::unique_ptr<AudioNodeOutput> AudioNodeOutput::create(AudioHandler* handler,
 
 void AudioNodeOutput::dispose()
 {
-#if ENABLE_ASSERT
     m_didCallDispose = true;
-#endif
+
     deferredTaskHandler().removeMarkedAudioNodeOutput(this);
     disconnectAll();
-    ASSERT(m_inputs.isEmpty());
-    ASSERT(m_params.isEmpty());
+    DCHECK(m_inputs.isEmpty());
+    DCHECK(m_params.isEmpty());
 }
 
 void AudioNodeOutput::setNumberOfChannels(unsigned numberOfChannels)
 {
     DCHECK_LE(numberOfChannels, BaseAudioContext::maxNumberOfChannels());
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     m_desiredNumberOfChannels = numberOfChannels;
 
@@ -75,7 +72,7 @@ void AudioNodeOutput::setNumberOfChannels(unsigned numberOfChannels)
         // If we're in the audio thread then we can take care of it right away (we should be at the very start or end of a rendering quantum).
         updateNumberOfChannels();
     } else {
-        ASSERT(!m_didCallDispose);
+        DCHECK(!m_didCallDispose);
         // Let the context take care of it in the audio thread in the pre and post render tasks.
         deferredTaskHandler().markAudioNodeOutputDirty(this);
     }
@@ -98,8 +95,8 @@ void AudioNodeOutput::updateRenderingState()
 
 void AudioNodeOutput::updateNumberOfChannels()
 {
-    ASSERT(deferredTaskHandler().isAudioThread());
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isAudioThread());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     if (m_numberOfChannels != m_desiredNumberOfChannels) {
         m_numberOfChannels = m_desiredNumberOfChannels;
@@ -110,8 +107,8 @@ void AudioNodeOutput::updateNumberOfChannels()
 
 void AudioNodeOutput::propagateChannelCount()
 {
-    ASSERT(deferredTaskHandler().isAudioThread());
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isAudioThread());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     if (isChannelCountKnown()) {
         // Announce to any nodes we're connected to that we changed our channel count for its input.
@@ -122,8 +119,9 @@ void AudioNodeOutput::propagateChannelCount()
 
 AudioBus* AudioNodeOutput::pull(AudioBus* inPlaceBus, size_t framesToProcess)
 {
-    ASSERT(deferredTaskHandler().isAudioThread());
-    ASSERT(m_renderingFanOutCount > 0 || m_renderingParamFanOutCount > 0);
+    DCHECK(deferredTaskHandler().isAudioThread());
+    DCHECK_GT(m_renderingFanOutCount, 0u);
+    DCHECK_GT(m_renderingParamFanOutCount, 0u);

[Raymond Toy, 2016/08/10 16:29:15]

This is wrong.  The original ASSERT was an OR, so only one condition needed to
be true.  Now both conditions need to be true with DCHECK.

[HyungwookLee, 2016/08/11 08:35:15]

Done.

 
     // Causes our AudioNode to process if it hasn't already for this render quantum.
     // We try to do in-place processing (using inPlaceBus) if at all possible,
@@ -141,19 +139,19 @@ AudioBus* AudioNodeOutput::pull(AudioBus* inPlaceBus, size_t framesToProcess)
 
 AudioBus* AudioNodeOutput::bus() const
 {
-    ASSERT(deferredTaskHandler().isAudioThread());
+    DCHECK(deferredTaskHandler().isAudioThread());
     return m_isInPlace ? m_inPlaceBus.get() : m_internalBus.get();
 }
 
 unsigned AudioNodeOutput::fanOutCount()
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     return m_inputs.size();
 }
 
 unsigned AudioNodeOutput::paramFanOutCount()
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     return m_params.size();
 }
 
@@ -164,21 +162,21 @@ unsigned AudioNodeOutput::renderingFanOutCount() const
 
 void AudioNodeOutput::addInput(AudioNodeInput& input)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     m_inputs.add(&input);
     input.handler().makeConnection();
 }
 
 void AudioNodeOutput::removeInput(AudioNodeInput& input)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     input.handler().breakConnection();
     m_inputs.remove(&input);
 }
 
 void AudioNodeOutput::disconnectAllInputs()
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     // AudioNodeInput::disconnect() changes m_inputs by calling removeInput().
     while (!m_inputs.isEmpty())
@@ -187,33 +185,33 @@ void AudioNodeOutput::disconnectAllInputs()
 
 void AudioNodeOutput::disconnectInput(AudioNodeInput& input)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
-    ASSERT(isConnectedToInput(input));
+    DCHECK(deferredTaskHandler().isGraphOwner());
+    DCHECK(isConnectedToInput(input));
     input.disconnect(*this);
 }
 
 void AudioNodeOutput::disconnectAudioParam(AudioParamHandler& param)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
-    ASSERT(isConnectedToAudioParam(param));
+    DCHECK(deferredTaskHandler().isGraphOwner());
+    DCHECK(isConnectedToAudioParam(param));
     param.disconnect(*this);
 }
 
 void AudioNodeOutput::addParam(AudioParamHandler& param)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     m_params.add(&param);
 }
 
 void AudioNodeOutput::removeParam(AudioParamHandler& param)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     m_params.remove(&param);
 }
 
 void AudioNodeOutput::disconnectAllParams()
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     // AudioParam::disconnect() changes m_params by calling removeParam().
     while (!m_params.isEmpty())
@@ -228,19 +226,19 @@ void AudioNodeOutput::disconnectAll()
 
 bool AudioNodeOutput::isConnectedToInput(AudioNodeInput& input)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     return m_inputs.contains(&input);
 }
 
 bool AudioNodeOutput::isConnectedToAudioParam(AudioParamHandler& param)
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
     return m_params.contains(&param);
 }
 
 void AudioNodeOutput::disable()
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     if (m_isEnabled) {
         m_isEnabled = false;
@@ -251,7 +249,7 @@ void AudioNodeOutput::disable()
 
 void AudioNodeOutput::enable()
 {
-    ASSERT(deferredTaskHandler().isGraphOwner());
+    DCHECK(deferredTaskHandler().isGraphOwner());
 
     if (!m_isEnabled) {
         m_isEnabled = true;