| Index: content/renderer/media/media_stream_impl.h
|
| diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
|
| index 1845ca09b935739d9f571df70214ce23fab2d186..5421422ffb6d8cc6f78ed49ded6b836e9025656c 100644
|
| --- a/content/renderer/media/media_stream_impl.h
|
| +++ b/content/renderer/media/media_stream_impl.h
|
| @@ -31,6 +31,7 @@ class MediaStreamAudioRenderer;
|
| namespace content {
|
| class MediaStreamDependencyFactory;
|
| class MediaStreamDispatcher;
|
| +class MediaStreamSourceObserver;
|
| class VideoCaptureImplManager;
|
| class WebRtcAudioRenderer;
|
| class WebRtcLocalAudioRenderer;
|
| @@ -62,6 +63,11 @@ class CONTENT_EXPORT MediaStreamImpl
|
| // This can save some overhead time when the |url| is not media stream.
|
| static bool CheckMediaStream(const GURL& url);
|
|
|
| + // Release source observers from WebMediaStream. This breaks circular
|
| + // references to MediaStreamSource. See MediaStreamSourceObserver's comment
|
| + // for detail.
|
| + static void ReleaseSourceObservers(WebKit::WebMediaStream descriptor);
|
| +
|
| // WebKit::WebUserMediaClient implementation
|
| virtual void requestUserMedia(
|
| const WebKit::WebUserMediaRequest& user_media_request,
|
| @@ -139,6 +145,7 @@ class CONTENT_EXPORT MediaStreamImpl
|
| : request_id(request_id), generated(false), frame(frame),
|
| request(request) {
|
| }
|
| + ~UserMediaRequestInfo();
|
| int request_id;
|
| // True if MediaStreamDispatcher has generated the stream, see
|
| // OnStreamGenerated.
|
|
|