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

Unified Diff: Source/WebCore/Modules/webaudio/AudioNodeInput.cpp

Issue 12543030: Merge 144417 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « no previous file | Source/WebCore/Modules/webaudio/AudioNodeOutput.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/Modules/webaudio/AudioNodeInput.cpp
===================================================================
--- Source/WebCore/Modules/webaudio/AudioNodeInput.cpp (revision 145455)
+++ Source/WebCore/Modules/webaudio/AudioNodeInput.cpp (working copy)
@@ -154,7 +154,9 @@
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());
}
return maxChannels;
« no previous file with comments | « no previous file | Source/WebCore/Modules/webaudio/AudioNodeOutput.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698