Index: Source/modules/mediastream/MediaStreamTrack.h |
diff --git a/Source/modules/mediastream/MediaStreamTrack.h b/Source/modules/mediastream/MediaStreamTrack.h |
index 40347d006b4b56b2f069956f833a9f2cee161ea7..ca44c8797c04a25fa6f59eb99bf7b24465767ada 100644 |
--- a/Source/modules/mediastream/MediaStreamTrack.h |
+++ b/Source/modules/mediastream/MediaStreamTrack.h |
@@ -45,8 +45,8 @@ class ExceptionState; |
class MediaStreamComponent; |
class MediaStreamTrackSourcesCallback; |
-class MediaStreamTrack FINAL : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer { |
- REFCOUNTED_EVENT_TARGET(MediaStreamTrack); |
+class MediaStreamTrack FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer { |
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MediaStreamTrack>); |
public: |
class Observer { |
public: |
@@ -54,7 +54,7 @@ public: |
virtual void trackEnded() = 0; |
}; |
- static PassRefPtr<MediaStreamTrack> create(ExecutionContext*, MediaStreamComponent*); |
+ static PassRefPtrWillBeRawPtr<MediaStreamTrack> create(ExecutionContext*, MediaStreamComponent*); |
virtual ~MediaStreamTrack(); |
String kind() const; |
@@ -68,7 +68,7 @@ public: |
static void getSources(ExecutionContext*, PassOwnPtr<MediaStreamTrackSourcesCallback>, ExceptionState&); |
void stopTrack(ExceptionState&); |
- PassRefPtr<MediaStreamTrack> clone(ExecutionContext*); |
+ PassRefPtrWillBeRawPtr<MediaStreamTrack> clone(ExecutionContext*); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(mute); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute); |
@@ -89,6 +89,8 @@ public: |
PassOwnPtr<AudioSourceProvider> createWebAudioSource(); |
+ void trace(Visitor*) { } |
+ |
private: |
MediaStreamTrack(ExecutionContext*, MediaStreamComponent*); |
@@ -105,7 +107,7 @@ private: |
RefPtr<MediaStreamComponent> m_component; |
}; |
-typedef Vector<RefPtr<MediaStreamTrack> > MediaStreamTrackVector; |
+typedef WillBeHeapVector<RefPtrWillBeMember<MediaStreamTrack> > MediaStreamTrackVector; |
} // namespace WebCore |