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

Side by Side Diff: Source/modules/webaudio/ChannelMergerNode.cpp

Issue 205173002: Move webaudio to oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 22 matching lines...) Expand all
33 #include "modules/webaudio/ChannelMergerNode.h" 33 #include "modules/webaudio/ChannelMergerNode.h"
34 34
35 #include "modules/webaudio/AudioContext.h" 35 #include "modules/webaudio/AudioContext.h"
36 #include "modules/webaudio/AudioNodeInput.h" 36 #include "modules/webaudio/AudioNodeInput.h"
37 #include "modules/webaudio/AudioNodeOutput.h" 37 #include "modules/webaudio/AudioNodeOutput.h"
38 38
39 const unsigned DefaultNumberOfOutputChannels = 1; 39 const unsigned DefaultNumberOfOutputChannels = 1;
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 PassRefPtr<ChannelMergerNode> ChannelMergerNode::create(AudioContext* context, f loat sampleRate, unsigned numberOfInputs) 43 PassRefPtrWillBeRawPtr<ChannelMergerNode> ChannelMergerNode::create(AudioContext * context, float sampleRate, unsigned numberOfInputs)
44 { 44 {
45 if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels()) 45 if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels())
46 return nullptr; 46 return nullptr;
47 47
48 return adoptRef(new ChannelMergerNode(context, sampleRate, numberOfInputs)); 48 return adoptRefWillBeNoop(new ChannelMergerNode(context, sampleRate, numberO fInputs));
49 } 49 }
50 50
51 ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, un signed numberOfInputs) 51 ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, un signed numberOfInputs)
52 : AudioNode(context, sampleRate) 52 : AudioNode(context, sampleRate)
53 , m_desiredNumberOfOutputChannels(DefaultNumberOfOutputChannels) 53 , m_desiredNumberOfOutputChannels(DefaultNumberOfOutputChannels)
54 { 54 {
55 ScriptWrappable::init(this); 55 ScriptWrappable::init(this);
56 // Create the requested number of inputs. 56 // Create the requested number of inputs.
57 for (unsigned i = 0; i < numberOfInputs; ++i) 57 for (unsigned i = 0; i < numberOfInputs; ++i)
58 addInput(adoptPtr(new AudioNodeInput(this))); 58 addInput(adoptPtr(new AudioNodeInput(this)));
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // channels because of tryLocks() in the context's updating system. So recor d the new number of 117 // channels because of tryLocks() in the context's updating system. So recor d the new number of
118 // output channels here. 118 // output channels here.
119 m_desiredNumberOfOutputChannels = numberOfOutputChannels; 119 m_desiredNumberOfOutputChannels = numberOfOutputChannels;
120 120
121 AudioNode::checkNumberOfChannelsForInput(input); 121 AudioNode::checkNumberOfChannelsForInput(input);
122 } 122 }
123 123
124 } // namespace WebCore 124 } // namespace WebCore
125 125
126 #endif // ENABLE(WEB_AUDIO) 126 #endif // ENABLE(WEB_AUDIO)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698