| Index: Source/modules/mediastream/MediaStream.h
|
| diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
|
| index 3fe40d9c1eea223598a233ff1eb94ed658964ace..1698cc331feb2ade3d3eef335e63cb2e56331bbb 100644
|
| --- a/Source/modules/mediastream/MediaStream.h
|
| +++ b/Source/modules/mediastream/MediaStream.h
|
| @@ -44,12 +44,12 @@ class MediaStream FINAL
|
| , public EventTargetWithInlineData
|
| , public ContextLifecycleObserver {
|
| DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>);
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
|
| + USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
|
| public:
|
| static MediaStream* create(ExecutionContext*);
|
| static MediaStream* create(ExecutionContext*, MediaStream*);
|
| static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&);
|
| - static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| + static MediaStream* create(ExecutionContext*, MediaStreamDescriptor*);
|
| virtual ~MediaStream();
|
|
|
| // DEPRECATED
|
| @@ -90,7 +90,7 @@ public:
|
| virtual void trace(Visitor*) OVERRIDE;
|
|
|
| private:
|
| - MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| + MediaStream(ExecutionContext*, MediaStreamDescriptor*);
|
| MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
|
|
|
| // ContextLifecycleObserver
|
| @@ -107,7 +107,7 @@ private:
|
|
|
| MediaStreamTrackVector m_audioTracks;
|
| MediaStreamTrackVector m_videoTracks;
|
| - RefPtr<MediaStreamDescriptor> m_descriptor;
|
| + Member<MediaStreamDescriptor> m_descriptor;
|
|
|
| Timer<MediaStream> m_scheduledEventTimer;
|
| WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
|
|
|