| Index: third_party/WebKit/Source/modules/mediastream/MediaStream.h
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.h b/third_party/WebKit/Source/modules/mediastream/MediaStream.h
|
| index 6ee0ef6da7517d29f540d2ab3a0be4fdaa5f2c98..a43cc24e245d8137f210cea8dc582d4f5b94a6b5 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/MediaStream.h
|
| +++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.h
|
| @@ -50,7 +50,7 @@ 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*);
|
| ~MediaStream() override;
|
|
|
| // DEPRECATED
|
| @@ -82,7 +82,7 @@ public:
|
| // MediaStreamDescriptorClient
|
| void streamEnded() override;
|
|
|
| - MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
|
| + MediaStreamDescriptor* descriptor() const { return m_descriptor; }
|
|
|
| // EventTarget
|
| const AtomicString& interfaceName() const override;
|
| @@ -96,7 +96,7 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| + MediaStream(ExecutionContext*, MediaStreamDescriptor*);
|
| MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
|
|
|
| // ContextLifecycleObserver
|
| @@ -115,7 +115,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;
|
|
|