| Index: Source/modules/mediastream/MediaStream.h
|
| diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
|
| index 53b97c05a42f92db8f206dd743e14d3e055bfbb9..2f71dc7bf66938784fc3e97325cb6bbcb340daa2 100644
|
| --- a/Source/modules/mediastream/MediaStream.h
|
| +++ b/Source/modules/mediastream/MediaStream.h
|
| @@ -40,13 +40,13 @@ namespace WebCore {
|
|
|
| class ExceptionState;
|
|
|
| -class MediaStream FINAL : public RefCounted<MediaStream>, public ScriptWrappable, public URLRegistrable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextLifecycleObserver {
|
| - REFCOUNTED_EVENT_TARGET(MediaStream);
|
| +class MediaStream FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaStream>, public ScriptWrappable, public URLRegistrable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextLifecycleObserver {
|
| + DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MediaStream>);
|
| public:
|
| - static PassRefPtr<MediaStream> create(ExecutionContext*);
|
| - static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStream>);
|
| - static PassRefPtr<MediaStream> create(ExecutionContext*, const MediaStreamTrackVector&);
|
| - static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| + static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*);
|
| + static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaStream>);
|
| + static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*, const MediaStreamTrackVector&);
|
| + static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| virtual ~MediaStream();
|
|
|
| // DEPRECATED
|
| @@ -54,8 +54,8 @@ public:
|
|
|
| String id() const { return m_descriptor->id(); }
|
|
|
| - void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionState&);
|
| - void removeTrack(PassRefPtr<MediaStreamTrack>, ExceptionState&);
|
| + void addTrack(PassRefPtrWillBeRawPtr<MediaStreamTrack>, ExceptionState&);
|
| + void removeTrack(PassRefPtrWillBeRawPtr<MediaStreamTrack>, ExceptionState&);
|
| MediaStreamTrack* getTrackById(String);
|
|
|
| MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }
|
| @@ -81,6 +81,8 @@ public:
|
| // URLRegistrable
|
| virtual URLRegistry& registry() const OVERRIDE;
|
|
|
| + void trace(Visitor*) { }
|
| +
|
| protected:
|
| MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
|
|
| @@ -105,7 +107,7 @@ private:
|
| Vector<RefPtr<Event> > m_scheduledEvents;
|
| };
|
|
|
| -typedef Vector<RefPtr<MediaStream> > MediaStreamVector;
|
| +typedef WillBeHeapVector<RefPtrWillBeMember<MediaStream> > MediaStreamVector;
|
|
|
| } // namespace WebCore
|
|
|
|
|