WebAudio: Split AudioNode::finishDeref into two parts.

Source/modules/webaudio/AudioContext.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 663 matching lines @@
 bool AudioContext::isAudioThread() const
 {
     return currentThread() == m_audioThread;
 }
 
 bool AudioContext::isGraphOwner() const
 {
     return currentThread() == m_graphOwnerThread;
 }
 
+void AudioContext::addDeferredBreakConnection(AudioNode& node)
+{
+    ASSERT(isAudioThread());
+    m_deferredBreakConnectionList.append(&node);
+}
+
 void AudioContext::addDeferredFinishDeref(AudioNode* node)
 {
     ASSERT(isAudioThread());
     m_deferredFinishDerefList.append(node);
 }
 
 void AudioContext::handlePreRenderTasks()
 {
     ASSERT(isAudioThread());
 
@@ skipping 14 matching lines @@
 
 void AudioContext::handlePostRenderTasks()
 {
     ASSERT(isAudioThread());
 
     // Must use a tryLock() here too.  Don't worry, the lock will very rarely be contended and this method is called frequently.
     // The worst that can happen is that there will be some nodes which will take slightly longer than usual to be deleted or removed
     // from the render graph (in which case they'll render silence).
     bool mustReleaseLock;
     if (tryLock(mustReleaseLock)) {
-        // Take care of finishing any derefs where the tryLock() failed previously.
-        handleDeferredFinishDerefs();
+        // Take care of AudioNode tasks where the tryLock() failed previously.
+        handleDeferredAudioNodeTasks();
 
         // Dynamically clean up nodes which are no longer needed.
         derefFinishedSourceNodes();
 
         // Don't delete in the real-time thread. Let the main thread do it.
         // Ref-counted objects held by certain AudioNodes may not be thread-safe.
         scheduleNodeDeletion();
 
         // Fixup the state of any dirty AudioSummingJunctions and AudioNodeOutputs.
         handleDirtyAudioSummingJunctions();
         handleDirtyAudioNodeOutputs();
 
         updateAutomaticPullNodes();
 
         if (mustReleaseLock)
             unlock();
     }
 }
 
-void AudioContext::handleDeferredFinishDerefs()
+void AudioContext::handleDeferredAudioNodeTasks()
 {
     ASSERT(isAudioThread() && isGraphOwner());
+
+    for (unsigned i = 0; i < m_deferredBreakConnectionList.size(); ++i)
+        m_deferredBreakConnectionList[i]->breakConnectionWithLock();
+    m_deferredBreakConnectionList.clear();
+
     for (unsigned i = 0; i < m_deferredFinishDerefList.size(); ++i) {
         AudioNode* node = m_deferredFinishDerefList[i];

[sof, 2014/07/14 19:09:26]

style nit: if you want to use a consistent style in these two loops, shorten out
'node' ?

[tkent, 2014/07/15 01:19:23]

Done.

         node->finishDeref();
     }
-
     m_deferredFinishDerefList.clear();
 }
 
 void AudioContext::markForDeletion(AudioNode* node)
 {
     ASSERT(isGraphOwner());
 
     if (!isInitialized())
         m_nodesToDelete.append(node);
     else
@@ skipping 197 matching lines @@
     visitor->trace(m_renderTarget);
     visitor->trace(m_destinationNode);
     visitor->trace(m_listener);
     visitor->trace(m_dirtySummingJunctions);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)