Index: Source/modules/webaudio/AudioNodeOutput.h |
diff --git a/Source/modules/webaudio/AudioNodeOutput.h b/Source/modules/webaudio/AudioNodeOutput.h |
index 6dcc13bb028f134fdf0280363aff95501e0936bc..9760c9d5420e2a813b09096bc78ec99f3cf60c13 100644 |
--- a/Source/modules/webaudio/AudioNodeOutput.h |
+++ b/Source/modules/webaudio/AudioNodeOutput.h |
@@ -38,11 +38,11 @@ class AudioNodeInput; |
// AudioNodeOutput represents a single output for an AudioNode. |
// It may be connected to one or more AudioNodeInputs. |
-class AudioNodeOutput : public NoBaseWillBeGarbageCollectedFinalized<AudioNodeOutput> { |
+class AudioNodeOutput : public GarbageCollectedFinalized<AudioNodeOutput> { |
public: |
// It's OK to pass 0 for numberOfChannels in which case |
// setNumberOfChannels() must be called later on. |
- static PassOwnPtrWillBeRawPtr<AudioNodeOutput> create(AudioNode*, unsigned numberOfChannels); |
+ static AudioNodeOutput* create(AudioNode*, unsigned numberOfChannels); |
void trace(Visitor*); |
// Can be called from any thread. |
@@ -84,7 +84,7 @@ public: |
private: |
AudioNodeOutput(AudioNode*, unsigned numberOfChannels); |
- RawPtrWillBeMember<AudioNode> m_node; |
+ Member<AudioNode> m_node; |
friend class AudioNodeInput; |
friend class AudioParam; |
@@ -139,8 +139,8 @@ private: |
// Oilpan: This HashMap holds connection references. We must call |
// AudioNode::makeConnection when we add an AudioNode to this, and must call |
// AudioNode::breakConnection() when we remove an AudioNode from this. |
- WillBeHeapHashMap<RawPtrWillBeMember<AudioNodeInput>, RefPtrWillBeMember<AudioNode> > m_inputs; |
- typedef WillBeHeapHashMap<RawPtrWillBeMember<AudioNodeInput>, RefPtrWillBeMember<AudioNode> >::iterator InputsIterator; |
+ HeapHashMap<Member<AudioNodeInput>, Member<AudioNode> > m_inputs; |
+ typedef HeapHashMap<Member<AudioNodeInput>, Member<AudioNode> >::iterator InputsIterator; |
bool m_isEnabled; |
// For the purposes of rendering, keeps track of the number of inputs and AudioParams we're connected to. |
@@ -148,7 +148,7 @@ private: |
unsigned m_renderingFanOutCount; |
unsigned m_renderingParamFanOutCount; |
- WillBeHeapHashSet<RefPtrWillBeMember<AudioParam> > m_params; |
+ HeapHashSet<Member<AudioParam> > m_params; |
}; |
} // namespace blink |