Changeset 145456 in webkit

Timestamp:

Mar 11, 2013, 6:25:33 PM (12 years ago)

Author:

cevans@google.com

Message:

Merge 144417
BUG=172342
Review URL: ​https://codereview.chromium.org/12543030

Location:

branches/chromium/1410/Source/WebCore/Modules/webaudio

Files:

• AudioNodeInput.cpp (modified) (1 diff)
• AudioNodeOutput.cpp (modified) (1 diff)

branches/chromium/1410/Source/WebCore/Modules/webaudio/AudioNodeInput.cpp

@@ -155 +155 @@
     for (HashSet<AudioNodeOutput*>::iterator i = m_outputs.begin(); i != m_outputs.end(); ++i) {
         AudioNodeOutput* output = *i;
-        maxChannels = max(maxChannels, output->bus()->numberOfChannels());
+        // Use output()->numberOfChannels() instead of output->bus()->numberOfChannels(),
+        // because the calling of AudioNodeOutput::bus() is not safe here.
+        maxChannels = max(maxChannels, output->numberOfChannels());
     }
     

branches/chromium/1410/Source/WebCore/Modules/webaudio/AudioNodeOutput.cpp

@@ -133 +133 @@
 AudioBus* AudioNodeOutput::bus() const
 {
+    // FIXME: Add ASSERTs/checkings to restrict the calling of bus(), because the calling is 
+    // only safe after setting the in-place bus in pull() and before updating the referred bus.
     ASSERT(const_cast<AudioNodeOutput*>(this)->context()->isAudioThread());
     ASSERT(m_actualDestinationBus);