Merge m_didCallDispose and m_isMarkedForDeletion flags into one flag

Source/modules/webaudio/AudioNode.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 38 matching lines @@
     : m_isInitialized(false)
     , m_nodeType(NodeTypeUnknown)
     , m_context(context)
     , m_sampleRate(sampleRate)
     , m_lastProcessingTime(-1)
     , m_lastNonSilentTime(-1)
 #if !ENABLE(OILPAN)
     , m_normalRefCount(1) // start out with normal refCount == 1 (like WTF::RefCounted class)
 #endif
     , m_connectionRefCount(0)
-#if !ENABLE(OILPAN)
-    , m_isMarkedForDeletion(false)
-#endif
     , m_isDisabled(false)
-#if ENABLE(ASSERT)
-    , m_didCallDispose(false)
-#endif
+    , m_isDisposeCalled(false)
     , m_channelCount(2)
     , m_channelCountMode(Max)
     , m_channelInterpretation(AudioBus::Speakers)
 {
     ScriptWrappable::init(this);
 #if ENABLE(OILPAN)
     m_context->registerLiveNode(*this);
 #endif
 #if DEBUG_AUDIONODE_REFERENCES
     if (!s_isNodeCountInitialized) {
         s_isNodeCountInitialized = true;
         atexit(AudioNode::printNodeCounts);
     }
 #endif
     ++s_instanceCount;
 }
 
 AudioNode::~AudioNode()
 {
-    ASSERT(m_didCallDispose);
+    ASSERT(m_isDisposeCalled);
     --s_instanceCount;
 #if DEBUG_AUDIONODE_REFERENCES
     --s_nodeCount[nodeType()];
 #if ENABLE(OILPAN)
     fprintf(stderr, "%p: %d: AudioNode::~AudioNode() %d\n", this, nodeType(), m_connectionRefCount);
 #else
     fprintf(stderr, "%p: %d: AudioNode::~AudioNode() %d %d\n", this, nodeType(), m_normalRefCount, m_connectionRefCount);
 #endif
 #endif
 }
 
 void AudioNode::initialize()
 {
     m_isInitialized = true;
 }
 
 void AudioNode::uninitialize()
 {
     m_isInitialized = false;
 }
 
 void AudioNode::dispose()
 {
     ASSERT(isMainThread());
     ASSERT(context()->isGraphOwner());
+
+    // This flag prevents:
+    // - the following disconnectAll() from re-registering this AudioNode into the m_outputs.

[tkent, 2014/08/14 23:25:01]

I recommend to wrap code comments in 80 columns.

[haraken, 2014/08/15 01:27:18]

Done.

+    // - this AudioNode from getting marked as dirty after calling unmarkDirtyNode.
+    m_isDisposeCalled = true;
+
 #if ENABLE(OILPAN)

[haraken, 2014/08/12 14:29:51]

Note: This CL depends on https://codereview.chromium.org/467683002/. After the
CL, disconnectAll() is called in both oilpan builds and non-oilpan builds here
(after m_isDisposeCalled is called).

     context()->removeAutomaticPullNode(this);
     for (unsigned i = 0; i < m_outputs.size(); ++i)
         output(i)->disconnectAll();
 #endif
     context()->unmarkDirtyNode(*this);
-#if ENABLE(ASSERT)
-    m_didCallDispose = true;
-#endif
 }
 
 String AudioNode::nodeTypeName() const
 {
     switch (m_nodeType) {
     case NodeTypeDestination:
         return "AudioDestinationNode";
     case NodeTypeOscillator:
         return "OscillatorNode";
     case NodeTypeAudioBufferSource:
@@ skipping 473 matching lines @@
 {
     ASSERT(context()->isGraphOwner());
 
     ASSERT(m_normalRefCount > 0);
     atomicDecrement(&m_normalRefCount);
 
 #if DEBUG_AUDIONODE_REFERENCES
     fprintf(stderr, "%p: %d: AudioNode::deref() %d %d\n", this, nodeType(), m_normalRefCount, m_connectionRefCount);
 #endif
 
-    if (!m_normalRefCount && !m_isMarkedForDeletion) {
+    if (!m_normalRefCount) {
         // All references are gone - we need to go away.
         for (unsigned i = 0; i < m_outputs.size(); ++i)
             output(i)->disconnectAll(); // This will deref() nodes we're connected to.
 
         // Mark for deletion at end of each render quantum or when context shuts
         // down.
         context()->markForDeletion(this);
-        m_isMarkedForDeletion = true;
     }
 }
 #endif
 
 #if DEBUG_AUDIONODE_REFERENCES
 
 bool AudioNode::s_isNodeCountInitialized = false;
 int AudioNode::s_nodeCount[NodeTypeEnd];
 
 void AudioNode::printNodeCounts()
@@ skipping 15 matching lines @@
 {
     visitor->trace(m_context);
     visitor->trace(m_inputs);
     visitor->trace(m_outputs);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)