Index: third_party/WebKit/Source/modules/mediastream/MediaStream.cpp |
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp |
index b36b5253b9e2b5e039552014b1c3fe2db63a6125..a40a97eeec6d0fc2897f8df55c4116b3f8c3841c 100644 |
--- a/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp |
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.cpp |
@@ -89,12 +89,12 @@ MediaStream* MediaStream::create(ExecutionContext* context, const MediaStreamTra |
return new MediaStream(context, audioTracks, videoTracks); |
} |
-MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor) |
+MediaStream* MediaStream::create(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor) |
{ |
return 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) |
@@ -143,7 +143,7 @@ MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector |
m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponents); |
m_descriptor->setClient(this); |
- MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get()); |
+ MediaStreamCenter::instance().didCreateMediaStream(m_descriptor); |
m_audioTracks = audioTracks; |
m_videoTracks = videoTracks; |
@@ -427,6 +427,7 @@ DEFINE_TRACE(MediaStream) |
{ |
visitor->trace(m_audioTracks); |
visitor->trace(m_videoTracks); |
+ visitor->trace(m_descriptor); |
visitor->trace(m_scheduledEvents); |
RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visitor); |
ContextLifecycleObserver::trace(visitor); |