Source/modules/webaudio/AudioContext.h - Issue 205173002: Move webaudio to oilpan

Unified Diff: Source/modules/webaudio/AudioContext.h

Issue 205173002: Move webaudio to oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Changed back AudioParam to gc Created 6 years, 7 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

« Source/modules/webaudio/AudioBuffer.cpp ('K') | « Source/modules/webaudio/AudioBufferSourceNode.cpp ('k') | Source/modules/webaudio/AudioContext.cpp » ('j') | Source/modules/webaudio/AudioContext.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/webaudio/AudioContext.h

diff --git a/Source/modules/webaudio/AudioContext.h b/Source/modules/webaudio/AudioContext.h

index 1086b649264b2570cfbbfe918323a9045cc9872a..b349acf119cff86b02ba4043c3f0cde75218d106 100644

--- a/Source/modules/webaudio/AudioContext.h

+++ b/Source/modules/webaudio/AudioContext.h

@@ -29,9 +29,10 @@

#include "core/dom/ActiveDOMObject.h"

#include "core/events/EventListener.h"

#include "core/events/EventTarget.h"

-#include "platform/audio/AudioBus.h"

#include "modules/webaudio/AsyncAudioDecoder.h"

#include "modules/webaudio/AudioDestinationNode.h"

+#include "platform/audio/AudioBus.h"

+#include "platform/heap/Handle.h"

#include "wtf/HashSet.h"

#include "wtf/MainThread.h"

#include "wtf/OwnPtr.h"

@@ -73,14 +74,16 @@ class WaveShaperNode;

// AudioContext is the cornerstone of the web audio API and all AudioNodes are created from it.

// For thread safety between the audio thread and the main thread, it has a rendering graph locking mechanism.

-class AudioContext : public ActiveDOMObject, public ScriptWrappable, public ThreadSafeRefCounted<AudioContext>, public EventTargetWithInlineData {

- DEFINE_EVENT_TARGET_REFCOUNTING(ThreadSafeRefCounted<AudioContext>);

+class AudioContext : public ThreadSafeRefCountedWillBeThreadSafeRefCountedGarbageCollected<AudioContext>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData {

+ DEFINE_EVENT_TARGET_REFCOUNTING(ThreadSafeRefCountedWillBeThreadSafeRefCountedGarbageCollected<AudioContext>);

public:

// Create an AudioContext for rendering to the audio hardware.

- static PassRefPtr<AudioContext> create(Document&, ExceptionState&);

+ static PassRefPtrWillBeRawPtr<AudioContext> create(Document&, ExceptionState&);

virtual ~AudioContext();

+ virtual void trace(Visitor*);

bool isInitialized() const;

// The constructor of an AudioNode must call this to initialize the context.

void lazyInitialize();

@@ -96,7 +99,7 @@ public:

double currentTime() const { return m_destinationNode->currentTime(); }

float sampleRate() const { return m_destinationNode->sampleRate(); }

- PassRefPtr<AudioBuffer> createBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionState&);

+ PassRefPtrWillBeRawPtr<AudioBuffer> createBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate, ExceptionState&);

// Asynchronous audio file data decoding.

void decodeAudioData(ArrayBuffer*, PassOwnPtr<AudioBufferCallback>, PassOwnPtr<AudioBufferCallback>, ExceptionState&);

@@ -104,29 +107,29 @@ public:

AudioListener* listener() { return m_listener.get(); }

// The AudioNode create methods are called on the main thread (from JavaScript).

- PassRefPtr<AudioBufferSourceNode> createBufferSource();

- PassRefPtr<MediaElementAudioSourceNode> createMediaElementSource(HTMLMediaElement*, ExceptionState&);

- PassRefPtr<MediaStreamAudioSourceNode> createMediaStreamSource(MediaStream*, ExceptionState&);

- PassRefPtr<MediaStreamAudioDestinationNode> createMediaStreamDestination();

- PassRefPtr<GainNode> createGain();

- PassRefPtr<BiquadFilterNode> createBiquadFilter();

- PassRefPtr<WaveShaperNode> createWaveShaper();

- PassRefPtr<DelayNode> createDelay(ExceptionState&);

- PassRefPtr<DelayNode> createDelay(double maxDelayTime, ExceptionState&);

- PassRefPtr<PannerNode> createPanner();

- PassRefPtr<ConvolverNode> createConvolver();

- PassRefPtr<DynamicsCompressorNode> createDynamicsCompressor();

- PassRefPtr<AnalyserNode> createAnalyser();

- PassRefPtr<ScriptProcessorNode> createScriptProcessor(ExceptionState&);

- PassRefPtr<ScriptProcessorNode> createScriptProcessor(size_t bufferSize, ExceptionState&);

- PassRefPtr<ScriptProcessorNode> createScriptProcessor(size_t bufferSize, size_t numberOfInputChannels, ExceptionState&);

- PassRefPtr<ScriptProcessorNode> createScriptProcessor(size_t bufferSize, size_t numberOfInputChannels, size_t numberOfOutputChannels, ExceptionState&);

- PassRefPtr<ChannelSplitterNode> createChannelSplitter(ExceptionState&);

- PassRefPtr<ChannelSplitterNode> createChannelSplitter(size_t numberOfOutputs, ExceptionState&);

- PassRefPtr<ChannelMergerNode> createChannelMerger(ExceptionState&);

- PassRefPtr<ChannelMergerNode> createChannelMerger(size_t numberOfInputs, ExceptionState&);

- PassRefPtr<OscillatorNode> createOscillator();

- PassRefPtr<PeriodicWave> createPeriodicWave(Float32Array* real, Float32Array* imag, ExceptionState&);

+ PassRefPtrWillBeRawPtr<AudioBufferSourceNode> createBufferSource();

+ PassRefPtrWillBeRawPtr<MediaElementAudioSourceNode> createMediaElementSource(HTMLMediaElement*, ExceptionState&);

+ PassRefPtrWillBeRawPtr<MediaStreamAudioSourceNode> createMediaStreamSource(MediaStream*, ExceptionState&);

+ PassRefPtrWillBeRawPtr<MediaStreamAudioDestinationNode> createMediaStreamDestination();

+ PassRefPtrWillBeRawPtr<GainNode> createGain();

+ PassRefPtrWillBeRawPtr<BiquadFilterNode> createBiquadFilter();

+ PassRefPtrWillBeRawPtr<WaveShaperNode> createWaveShaper();

+ PassRefPtrWillBeRawPtr<DelayNode> createDelay(ExceptionState&);

+ PassRefPtrWillBeRawPtr<DelayNode> createDelay(double maxDelayTime, ExceptionState&);

+ PassRefPtrWillBeRawPtr<PannerNode> createPanner();

+ PassRefPtrWillBeRawPtr<ConvolverNode> createConvolver();

+ PassRefPtrWillBeRawPtr<DynamicsCompressorNode> createDynamicsCompressor();

+ PassRefPtrWillBeRawPtr<AnalyserNode> createAnalyser();

+ PassRefPtrWillBeRawPtr<ScriptProcessorNode> createScriptProcessor(ExceptionState&);

+ PassRefPtrWillBeRawPtr<ScriptProcessorNode> createScriptProcessor(size_t bufferSize, ExceptionState&);

+ PassRefPtrWillBeRawPtr<ScriptProcessorNode> createScriptProcessor(size_t bufferSize, size_t numberOfInputChannels, ExceptionState&);

+ PassRefPtrWillBeRawPtr<ScriptProcessorNode> createScriptProcessor(size_t bufferSize, size_t numberOfInputChannels, size_t numberOfOutputChannels, ExceptionState&);

+ PassRefPtrWillBeRawPtr<ChannelSplitterNode> createChannelSplitter(ExceptionState&);

+ PassRefPtrWillBeRawPtr<ChannelSplitterNode> createChannelSplitter(size_t numberOfOutputs, ExceptionState&);

+ PassRefPtrWillBeRawPtr<ChannelMergerNode> createChannelMerger(ExceptionState&);

+ PassRefPtrWillBeRawPtr<ChannelMergerNode> createChannelMerger(size_t numberOfInputs, ExceptionState&);

+ PassRefPtrWillBeRawPtr<OscillatorNode> createOscillator();

+ PassRefPtrWillBeRawPtr<PeriodicWave> createPeriodicWave(Float32Array* real, Float32Array* imag, ExceptionState&);

// When a source node has no more processing to do (has finished playing), then it tells the context to dereference it.

void notifyNodeFinishedProcessing(AudioNode*);

@@ -266,8 +269,8 @@ private:

// Make sure to dereference them here.

void derefUnfinishedSourceNodes();

- RefPtr<AudioDestinationNode> m_destinationNode;

- RefPtr<AudioListener> m_listener;

+ RefPtrWillBeMember<AudioDestinationNode> m_destinationNode;

+ RefPtrWillBeMember<AudioListener> m_listener;

// Only accessed in the audio thread.

Vector<AudioNode*> m_finishedNodes;

@@ -288,7 +291,7 @@ private:

bool m_isDeletionScheduled;

// Only accessed when the graph lock is held.

- HashSet<AudioSummingJunction*> m_dirtySummingJunctions;

+ HashSet<AudioSummingJunction* > m_dirtySummingJunctions;

haraken 2014/05/07 04:02:16 This is mis-edit. It looks safe to use raw pointe

keishi 2014/05/07 07:59:24 Done.

HashSet<AudioNodeOutput*> m_dirtyAudioNodeOutputs;

haraken 2014/05/07 04:02:16 These raw pointers look safe as well, but let's mo

void handleDirtyAudioSummingJunctions();

void handleDirtyAudioNodeOutputs();

@@ -311,7 +314,7 @@ private:

// Only accessed in the audio thread.

Vector<AudioNode*> m_deferredFinishDerefList;

- RefPtr<AudioBuffer> m_renderTarget;

+ RefPtrWillBeMember<AudioBuffer> m_renderTarget;

bool m_isOfflineContext;