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 ab5286f100f550ab7f57e779450a19b657ae7bea..a94868f2010fd627dfaa452bdb1f725ef8906dc6 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; |
String id() const { return m_descriptor->id(); } |
@@ -77,7 +77,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; |
@@ -91,7 +91,7 @@ public: |
DECLARE_VIRTUAL_TRACE(); |
private: |
- MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>); |
+ MediaStream(ExecutionContext*, MediaStreamDescriptor*); |
MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks); |
// ContextLifecycleObserver |
@@ -110,7 +110,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; |