Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: Source/modules/webaudio/AudioNodeOutput.cpp

Issue 886173004: Fix AudioNode.disconnect() to support selective disconnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Test for AudioParam disconnection Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/webaudio/AudioNodeOutput.cpp
diff --git a/Source/modules/webaudio/AudioNodeOutput.cpp b/Source/modules/webaudio/AudioNodeOutput.cpp
index d1fd4a1aee0fd3a1cd0b2520e9348a6d723838c4..0c364c1f81a59ab8d269672e713b94b7d0ec32bc 100644
--- a/Source/modules/webaudio/AudioNodeOutput.cpp
+++ b/Source/modules/webaudio/AudioNodeOutput.cpp
@@ -190,6 +190,18 @@ void AudioNodeOutput::disconnectAllInputs()
m_inputs.begin()->key->disconnect(*this);
}
+void AudioNodeOutput::disconnectInput(AudioNodeInput& input)
+{
+ ASSERT(context()->isGraphOwner() && isConnectedWithInput(input));
+ input.disconnect(*this);
+}
+
+void AudioNodeOutput::disconnectAudioParam(AudioParam& param)
+{
+ ASSERT(context()->isGraphOwner() && isConnectedWithAudioParam(param));
+ param.disconnect(*this);
+}
+
void AudioNodeOutput::addParam(AudioParam& param)
{
ASSERT(context()->isGraphOwner());
@@ -217,6 +229,18 @@ void AudioNodeOutput::disconnectAll()
disconnectAllParams();
}
+bool AudioNodeOutput::isConnectedWithInput(AudioNodeInput& input)
Raymond Toy 2015/02/11 21:31:18 ConnectedWithInput or ConnectedToInput? I think th
hongchan 2015/02/12 18:38:01 Done.
+{
+ ASSERT(context()->isGraphOwner());
+ return m_inputs.contains(&input);
+}
+
+bool AudioNodeOutput::isConnectedWithAudioParam(AudioParam& param)
+{
+ ASSERT(context()->isGraphOwner());
+ return m_params.contains(&param);
+}
+
void AudioNodeOutput::disable()
{
ASSERT(context()->isGraphOwner());
« Source/modules/webaudio/AudioNode.cpp ('K') | « Source/modules/webaudio/AudioNodeOutput.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698