WebAudio: Remove AudioNode::RefType.

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 37 matching lines @@
     , m_nodeType(NodeTypeUnknown)
     , m_context(context)
     , m_sampleRate(sampleRate)
 #if ENABLE(OILPAN)
     , m_keepAlive(adoptPtr(new Persistent<AudioNode>(this)))
 #endif
     , m_lastProcessingTime(-1)
     , m_lastNonSilentTime(-1)
     , m_normalRefCount(1) // start out with normal refCount == 1 (like WTF::RefCounted class)
     , m_connectionRefCount(0)
+    , m_wasDisconnected(false)
     , m_isMarkedForDeletion(false)
     , m_isDisabled(false)
     , m_channelCount(2)
     , m_channelCountMode(Max)
     , m_channelInterpretation(AudioBus::Speakers)
 {
     ScriptWrappable::init(this);
 #if DEBUG_AUDIONODE_REFERENCES
     if (!s_isNodeCountInitialized) {
         s_isNodeCountInitialized = true;
@@ skipping 394 matching lines @@
         // a tailTime attribute. Then the AudioNode only needs to remain "active" for tailTime seconds after there are no
         // longer any active connections.
         if (nodeType() != NodeTypeConvolver && nodeType() != NodeTypeDelay) {
             m_isDisabled = true;
             for (unsigned i = 0; i < m_outputs.size(); ++i)
                 output(i)->disable();
         }
     }
 }
 
-void AudioNode::ref(RefType refType)
+void AudioNode::ref()
 {
 #if ENABLE(OILPAN)
     ASSERT(m_keepAlive);
 #endif
-    switch (refType) {
-    case RefTypeNormal:
-        atomicIncrement(&m_normalRefCount);
-        break;
-    case RefTypeConnection:
-        atomicIncrement(&m_connectionRefCount);
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
+    atomicIncrement(&m_normalRefCount);
 
 #if DEBUG_AUDIONODE_REFERENCES
     fprintf(stderr, "%p: %d: AudioNode::ref(%d) %d %d\n", this, nodeType(), refType, m_normalRefCount, m_connectionRefCount);

[Raymond Toy, 2014/07/09 22:10:34]

Please fix this fprintf since refType is gone.

[tkent, 2014/07/10 08:07:42]

will do

 #endif
-
-    // See the disabling code in finishDeref() below. This handles the case where a node
-    // is being re-connected after being used at least once and disconnected.
-    // In this case, we need to re-enable.
-    if (refType == RefTypeConnection)
-        enableOutputsIfNecessary();
 }
 
-void AudioNode::deref(RefType refType)
+void AudioNode::wasConnected()
+{
+    atomicIncrement(&m_connectionRefCount);
+    // See the disabling code in finishDeref() below. This handles the case
+    // where a node is being re-connected after being used at least once and
+    // disconnected. In this case, we need to re-enable.
+    enableOutputsIfNecessary();
+}
+
+void AudioNode::deref()
 {
     // The actually work for deref happens completely within the audio context's graph lock.
     // In the case of the audio thread, we must use a tryLock to avoid glitches.
     bool hasLock = false;
     bool mustReleaseLock = false;
 
     if (context()->isAudioThread()) {
         // Real-time audio thread must not contend lock (to avoid glitches).
         hasLock = context()->tryLock(mustReleaseLock);
     } else {
         context()->lock(mustReleaseLock);
         hasLock = true;
     }
 
     if (hasLock) {
         // This is where the real deref work happens.
-        finishDeref(refType);
+        finishDeref();
 
         if (mustReleaseLock)
             context()->unlock();
     } else {
         // We were unable to get the lock, so put this in a list to finish up later.
         ASSERT(context()->isAudioThread());
-        ASSERT(refType == RefTypeConnection);
         context()->addDeferredFinishDeref(this);
     }
 
     // Once AudioContext::uninitialize() is called there's no more chances for deleteMarkedNodes() to get called, so we call here.
     // We can't call in AudioContext::~AudioContext() since it will never be called as long as any AudioNode is alive
     // because AudioNodes keep a reference to the context.
     if (!context()->isInitialized())
         context()->deleteMarkedNodes();
 }
 
-void AudioNode::finishDeref(RefType refType)
+void AudioNode::willBeDisconnected()
+{
+    // This function should be called before deref().

[Raymond Toy, 2014/07/09 22:10:33]

Should or must be called before deref()?

[tkent, 2014/07/10 08:07:42]

Must.  I'll remove this comment.  The comment in AudioNode.h is enough.

+    ASSERT(m_normalRefCount > 0);
+    atomicDecrement(&m_connectionRefCount);
+    m_wasDisconnected = true;
+}
+
+void AudioNode::finishDeref()
 {
     ASSERT(context()->isGraphOwner());
 
-    switch (refType) {
-    case RefTypeNormal:
-        ASSERT(m_normalRefCount > 0);
-        atomicDecrement(&m_normalRefCount);
-        break;
-    case RefTypeConnection:
-        ASSERT(m_connectionRefCount > 0);
-        atomicDecrement(&m_connectionRefCount);
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
+    ASSERT(m_normalRefCount > 0);
+    atomicDecrement(&m_normalRefCount);
 
 #if DEBUG_AUDIONODE_REFERENCES
     fprintf(stderr, "%p: %d: AudioNode::deref(%d) %d %d\n", this, nodeType(), refType, m_normalRefCount, m_connectionRefCount);

[Raymond Toy, 2014/07/09 22:10:34]

Fix fprintf since refType is gone now.

[tkent, 2014/07/10 08:07:42]

will do.

 #endif
 
-    if (!m_connectionRefCount) {
-        if (!m_normalRefCount) {
-            if (!m_isMarkedForDeletion) {
-                // 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.
+    if (m_wasDisconnected) {
+        if (m_connectionRefCount == 0 && m_normalRefCount > 0)
+            disableOutputsIfNecessary();
+        m_wasDisconnected = false;
+    }
 
-                // Mark for deletion at end of each render quantum or when context shuts down.
-                context()->markForDeletion(this);
-                m_isMarkedForDeletion = true;
-            }
-        } else if (refType == RefTypeConnection)
-            disableOutputsIfNecessary();
+    if (!m_normalRefCount && !m_isMarkedForDeletion) {
+        // 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;
     }
 }
 
 #if DEBUG_AUDIONODE_REFERENCES
 
 bool AudioNode::s_isNodeCountInitialized = false;
 int AudioNode::s_nodeCount[NodeTypeEnd];
 
 void AudioNode::printNodeCounts()
 {
@@ skipping 25 matching lines @@
     // it cannot be reattached. Therefore, the reference count
     // will not go above zero again.
     ASSERT(m_keepAlive);
     m_keepAlive = nullptr;
 }
 #endif
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)