Changeset 86722 in webkit

Timestamp:

May 17, 2011 5:12:46 PM (13 years ago)

Author:

crogers@google.com

Message:

2011-05-17 Chris Rogers <​crogers@google.com>

Reviewed by Kenneth Russell.

Make sure that AudioNode gets re-enabled after having been disconnected and re-connected.
​https://bugs.webkit.org/show_bug.cgi?id=60995

No new tests since audio API is not yet implemented.

• webaudio/AudioNode.cpp: (WebCore::AudioNode::ref):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• webaudio/AudioNode.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Chris Rogers  <crogers@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Make sure that AudioNode gets re-enabled after having been disconnected and re-connected.
+        https://bugs.webkit.org/show_bug.cgi?id=60995
+
+        No new tests since audio API is not yet implemented.
+
+        * webaudio/AudioNode.cpp:
+        (WebCore::AudioNode::ref):
+
 2011-05-17  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/webaudio/AudioNode.cpp

@@ -192 +192 @@
 #endif
 
-    if (m_connectionRefCount == 1 && refType == RefTypeConnection) {
-        // FIXME: implement wake-up - this is an advanced feature and is not necessary in a simple implementation.
-        // We should not be "actively" connected to anything, but now we're "waking up"
-        // For example, a note which has finished playing, but is now being played again.
-        // Note that if this is considered a worthwhile feature to add, then an evaluation of the locking considerations must be made.
+    // 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 (m_isDisabled && m_connectionRefCount > 0 && refType == RefTypeConnection) {
+        ASSERT(isMainThread());
+        AudioContext::AutoLocker locker(context());
+
+        m_isDisabled = false;
+        for (unsigned i = 0; i < m_outputs.size(); ++i)
+            output(i)->enable();
     }
 }