Web Audio: Unapply Oilpan to AudioSummingJunction.

Source/modules/webaudio/AudioNodeInput.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNodeInput.h"
 
 #include "modules/webaudio/AudioContext.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include <algorithm>
 
 namespace blink {
 
 inline AudioNodeInput::AudioNodeInput(AudioNode& node)
-    : AudioSummingJunction(node.context())
+    : AudioSummingJunction(node.context()->handler())
     , m_node(node)
 {
     // Set to mono by default.
     m_internalSummingBus = AudioBus::create(1, AudioNode::ProcessingSizeInFrames);
 }
 
 AudioNodeInput* AudioNodeInput::create(AudioNode& node)
 {
     return new AudioNodeInput(node);
 }
 
 DEFINE_TRACE(AudioNodeInput)
 {
+    // TODO(tkent): Oilpan: m_renderingOutputs should not be strong references.
+    // This is a short-term workaround to avoid crashes, and causes AudioNode
+    // leaks.
+    AudioContext::AutoLocker locker(deferredTaskHandler());
+    for (size_t i = 0; i < m_renderingOutputs.size(); ++i)
+        visitor->trace(m_renderingOutputs[i]);
     visitor->trace(m_node);
-    AudioSummingJunction::trace(visitor);
 }
 
 void AudioNodeInput::connect(AudioNodeOutput& output)
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
 
     // Check if we're already connected to this output.
     if (m_outputs.contains(&output))
         return;
 
     output.addInput(*this);
     m_outputs.add(&output);
     changedOutputs();
 }
 
 void AudioNodeInput::disconnect(AudioNodeOutput& output)
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
 
     // First try to disconnect from "active" connections.
     if (m_outputs.contains(&output)) {
         m_outputs.remove(&output);
         changedOutputs();
         output.removeInput(*this);
         // Note: it's important to return immediately after removeInput() calls
         // since the node may be deleted.
         return;
     }
 
     // Otherwise, try to disconnect from disabled connections.
     if (m_disabledOutputs.contains(&output)) {
         m_disabledOutputs.remove(&output);
         output.removeInput(*this);
         // Note: it's important to return immediately after all removeInput() calls
         // since the node may be deleted.
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 void AudioNodeInput::disable(AudioNodeOutput& output)
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
     ASSERT(m_outputs.contains(&output));
 
     m_disabledOutputs.add(&output);
     m_outputs.remove(&output);
     changedOutputs();
 
     // Propagate disabled state to outputs.
     node().disableOutputsIfNecessary();
 }
 
 void AudioNodeInput::enable(AudioNodeOutput& output)
 {
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isGraphOwner());
     ASSERT(m_disabledOutputs.contains(&output));
 
     // Move output from disabled list to active list.
     m_outputs.add(&output);
     m_disabledOutputs.remove(&output);
     changedOutputs();
 
     // Propagate enabled state to outputs.
     node().enableOutputsIfNecessary();
 }
 
 void AudioNodeInput::didUpdate()
 {
     node().checkNumberOfChannelsForInput(this);
 }
 
 void AudioNodeInput::updateInternalBus()
 {
-    ASSERT(context()->isAudioThread());
-    ASSERT(context()->isGraphOwner());
+    ASSERT(deferredTaskHandler().isAudioThread());
+    ASSERT(deferredTaskHandler().isGraphOwner());
 
     unsigned numberOfInputChannels = numberOfChannels();
 
     if (numberOfInputChannels == m_internalSummingBus->numberOfChannels())
         return;
 
     m_internalSummingBus = AudioBus::create(numberOfInputChannels, AudioNode::ProcessingSizeInFrames);
 }
 
 unsigned AudioNodeInput::numberOfChannels() const
@@ skipping 12 matching lines @@
     }
 
     if (mode == AudioNode::ClampedMax)
         maxChannels = std::min(maxChannels, static_cast<unsigned>(node().channelCount()));
 
     return maxChannels;
 }
 
 AudioBus* AudioNodeInput::bus()
 {
-    ASSERT(context()->isAudioThread());
+    ASSERT(deferredTaskHandler().isAudioThread());
 
     // Handle single connection specially to allow for in-place processing.
     if (numberOfRenderingConnections() == 1 && node().internalChannelCountMode() == AudioNode::Max)
         return renderingOutput(0)->bus();
 
     // Multiple connections case or complex ChannelCountMode (or no connections).
     return internalSummingBus();
 }
 
 AudioBus* AudioNodeInput::internalSummingBus()
 {
-    ASSERT(context()->isAudioThread());
+    ASSERT(deferredTaskHandler().isAudioThread());
 
     return m_internalSummingBus.get();
 }
 
 void AudioNodeInput::sumAllConnections(AudioBus* summingBus, size_t framesToProcess)
 {
-    ASSERT(context()->isAudioThread());
+    ASSERT(deferredTaskHandler().isAudioThread());
 
     // We shouldn't be calling this method if there's only one connection, since it's less efficient.
     ASSERT(numberOfRenderingConnections() > 1 || node().internalChannelCountMode() != AudioNode::Max);
 
     ASSERT(summingBus);
     if (!summingBus)
         return;
 
     summingBus->zero();
 
     AudioBus::ChannelInterpretation interpretation = node().internalChannelInterpretation();
 
     for (unsigned i = 0; i < numberOfRenderingConnections(); ++i) {
         AudioNodeOutput* output = renderingOutput(i);
         ASSERT(output);
 
         // Render audio from this output.
         AudioBus* connectionBus = output->pull(0, framesToProcess);
 
         // Sum, with unity-gain.
         summingBus->sumFrom(*connectionBus, interpretation);
     }
 }
 
 AudioBus* AudioNodeInput::pull(AudioBus* inPlaceBus, size_t framesToProcess)
 {
-    ASSERT(context()->isAudioThread());
+    ASSERT(deferredTaskHandler().isAudioThread());
 
     // Handle single connection case.
     if (numberOfRenderingConnections() == 1 && node().internalChannelCountMode() == AudioNode::Max) {
         // The output will optimize processing using inPlaceBus if it's able.
         AudioNodeOutput* output = this->renderingOutput(0);
         return output->pull(inPlaceBus, framesToProcess);
     }
 
     AudioBus* internalSummingBus = this->internalSummingBus();
 
     if (!numberOfRenderingConnections()) {
         // At least, generate silence if we're not connected to anything.
         // FIXME: if we wanted to get fancy, we could propagate a 'silent hint' here to optimize the downstream graph processing.
         internalSummingBus->zero();
         return internalSummingBus;
     }
 
     // Handle multiple connections case.
     sumAllConnections(internalSummingBus, framesToProcess);
 
     return internalSummingBus;
 }
 
 } // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)