Merge 144417

Source/WebCore/Modules/webaudio/AudioNodeInput.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 136 matching lines @@
     m_internalSummingBus = adoptPtr(new AudioBus(numberOfInputChannels, AudioNode::ProcessingSizeInFrames));
 }
 
 unsigned AudioNodeInput::numberOfChannels() const
 {
     // Find the number of channels of the connection with the largest number of channels.
     unsigned maxChannels = 1; // one channel is the minimum allowed
 
     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;
 }
 
 unsigned AudioNodeInput::numberOfRenderingChannels()
 {
     ASSERT(context()->isAudioThread());
 
     // Find the number of channels of the rendering connection with the largest number of channels.
@@ skipping 73 matching lines @@
 
     // Handle multiple connections case.
     sumAllConnections(internalSummingBus, framesToProcess);
     
     return internalSummingBus;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)