From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp') diff --git a/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp b/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp index 9f1989a92..b83c66769 100644 --- a/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp +++ b/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -40,15 +40,15 @@ const unsigned DefaultNumberOfOutputChannels = 1; namespace WebCore { -PassRefPtr ChannelMergerNode::create(AudioContext* context, float sampleRate, unsigned numberOfInputs) +RefPtr ChannelMergerNode::create(AudioContext& context, float sampleRate, unsigned numberOfInputs) { if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels()) return nullptr; - return adoptRef(new ChannelMergerNode(context, sampleRate, numberOfInputs)); + return adoptRef(*new ChannelMergerNode(context, sampleRate, numberOfInputs)); } -ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, unsigned numberOfInputs) +ChannelMergerNode::ChannelMergerNode(AudioContext& context, float sampleRate, unsigned numberOfInputs) : AudioNode(context, sampleRate) , m_desiredNumberOfOutputChannels(DefaultNumberOfOutputChannels) { @@ -104,7 +104,7 @@ void ChannelMergerNode::reset() // number of channels of our output. void ChannelMergerNode::checkNumberOfChannelsForInput(AudioNodeInput* input) { - ASSERT(context()->isAudioThread() && context()->isGraphOwner()); + ASSERT(context().isAudioThread() && context().isGraphOwner()); // Count how many channels we have all together from all of the inputs. unsigned numberOfOutputChannels = 0; -- cgit v1.2.1