Index: Source/modules/mediastream/MediaStream.cpp |
diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp |
index 79d077aed95068468342767f2257d9627e6574fd..986f75ff8023d3b5c41eda65e9698ea7af3235be 100644 |
--- a/Source/modules/mediastream/MediaStream.cpp |
+++ b/Source/modules/mediastream/MediaStream.cpp |
@@ -89,12 +89,12 @@ MediaStream* MediaStream::create(ExecutionContext* context, const MediaStreamTra |
return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, audioTracks, videoTracks)); |
} |
-MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor) |
+MediaStream* MediaStream::create(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor) |
{ |
return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, streamDescriptor)); |
} |
-MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor) |
+MediaStream::MediaStream(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor) |
: ContextLifecycleObserver(context) |
, m_stopped(false) |
, m_descriptor(streamDescriptor) |
@@ -147,7 +147,6 @@ MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector |
MediaStream::~MediaStream() |
{ |
- m_descriptor->setClient(0); |
} |
bool MediaStream::ended() const |
@@ -392,7 +391,9 @@ void MediaStream::trace(Visitor* visitor) |
visitor->trace(m_audioTracks); |
visitor->trace(m_videoTracks); |
visitor->trace(m_scheduledEvents); |
+ visitor->trace(m_descriptor); |
EventTargetWithInlineData::trace(visitor); |
+ MediaStreamDescriptorClient::trace(visitor); |
} |
} // namespace blink |