Chromium Code Reviews| Index: Source/modules/webaudio/OscillatorNode.cpp |
| diff --git a/Source/modules/webaudio/OscillatorNode.cpp b/Source/modules/webaudio/OscillatorNode.cpp |
| index a2d95dcb4a3508320a64deda6a12e2f669a2c7b4..ab6d6a7dfd37ea27789732eb0e6a901199f93043 100644 |
| --- a/Source/modules/webaudio/OscillatorNode.cpp |
| +++ b/Source/modules/webaudio/OscillatorNode.cpp |
| @@ -43,9 +43,9 @@ namespace WebCore { |
| using namespace VectorMath; |
| -PassRefPtr<OscillatorNode> OscillatorNode::create(AudioContext* context, float sampleRate) |
| +PassRefPtrWillBeRawPtr<OscillatorNode> OscillatorNode::create(AudioContext* context, float sampleRate) |
| { |
| - return adoptRef(new OscillatorNode(context, sampleRate)); |
| + return adoptRefWillBeNoop(new OscillatorNode(context, sampleRate)); |
| } |
| OscillatorNode::OscillatorNode(AudioContext* context, float sampleRate) |
| @@ -118,23 +118,39 @@ bool OscillatorNode::setType(unsigned type) |
| switch (type) { |
| case SINE: { |
| +#if !ENABLE(OILPAN) |
|
Mads Ager (chromium)
2014/03/20 08:33:28
We should get rid of this. We don't want to create
keishi
2014/03/27 07:39:37
Done.
|
| DEFINE_STATIC_REF(PeriodicWave, periodicWaveSine, (PeriodicWave::createSine(sampleRate))); |
| periodicWave = periodicWaveSine; |
| +#else |
| + periodicWave = PeriodicWave::createSine(sampleRate); |
| +#endif |
| break; |
| } |
| case SQUARE: { |
| +#if !ENABLE(OILPAN) |
| DEFINE_STATIC_REF(PeriodicWave, periodicWaveSquare, (PeriodicWave::createSquare(sampleRate))); |
| periodicWave = periodicWaveSquare; |
| +#else |
| + periodicWave = PeriodicWave::createSquare(sampleRate); |
| +#endif |
| break; |
| } |
| case SAWTOOTH: { |
| +#if !ENABLE(OILPAN) |
| DEFINE_STATIC_REF(PeriodicWave, periodicWaveSawtooth, (PeriodicWave::createSawtooth(sampleRate))); |
| periodicWave = periodicWaveSawtooth; |
| +#else |
| + periodicWave = PeriodicWave::createSawtooth(sampleRate); |
| +#endif |
| break; |
| } |
| case TRIANGLE: { |
| +#if !ENABLE(OILPAN) |
| DEFINE_STATIC_REF(PeriodicWave, periodicWaveTriangle, (PeriodicWave::createTriangle(sampleRate))); |
| periodicWave = periodicWaveTriangle; |
| +#else |
| + periodicWave = PeriodicWave::createTriangle(sampleRate); |
| +#endif |
| break; |
| } |
| case CUSTOM: |
| @@ -343,6 +359,14 @@ bool OscillatorNode::propagatesSilence() const |
| return !isPlayingOrScheduled() || hasFinished() || !m_periodicWave.get(); |
| } |
| +void OscillatorNode::trace(Visitor* visitor) |
| +{ |
| + visitor->trace(m_frequency); |
| + visitor->trace(m_detune); |
| + visitor->trace(m_periodicWave); |
| + AudioNode::trace(visitor); |
| +} |
| + |
| } // namespace WebCore |
| #endif // ENABLE(WEB_AUDIO) |