| Index: Source/modules/mediastream/MediaStream.cpp
|
| diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp
|
| index ac6ca8c77d5dee34c93bf72ce7d1fc9c97b3845b..de217991a7d9bff2c9e696b4834737a12e728292 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)
|
| @@ -150,7 +150,6 @@ MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector
|
|
|
| MediaStream::~MediaStream()
|
| {
|
| - m_descriptor->setClient(0);
|
| }
|
|
|
| bool MediaStream::ended() const
|
| @@ -395,7 +394,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
|
|
|