Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource

content/renderer/media/media_stream_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "webkit/media/media_stream_client.h"
 
 namespace webkit_media {
 class MediaStreamAudioRenderer;
 }
 
 namespace content {
 class MediaStreamDependencyFactory;
 class MediaStreamDispatcher;
+class MediaStreamSourceObserver;
 class VideoCaptureImplManager;
 class WebRtcAudioRenderer;
 class WebRtcLocalAudioRenderer;
 
 // MediaStreamImpl is a delegate for the Media Stream API messages used by
 // WebKit. It ties together WebKit, native PeerConnection in libjingle and
 // MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost)
 // in the browser process. It must be created, called and destroyed on the
 // render thread.
 // MediaStreamImpl have weak pointers to a MediaStreamDispatcher.
@@ skipping 11 matching lines @@
       VideoCaptureImplManager* vc_manager,
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~MediaStreamImpl();
 
   // Return true when the |url| is media stream.
   // This static function has the same functionalilty as IsMediaStream
   // except that it doesn't require an instance of this class.
   // 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,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
       OVERRIDE;
   virtual void cancelUserMediaRequest(
       const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
 
   // webkit_media::MediaStreamClient implementation.
@@ skipping 57 matching lines @@
   struct UserMediaRequestInfo {
     UserMediaRequestInfo()
         : request_id(0), generated(false), frame(NULL), request() {
     }
     UserMediaRequestInfo(int request_id,
                          WebKit::WebFrame* frame,
                          const WebKit::WebUserMediaRequest& request)
         : request_id(request_id), generated(false), frame(frame),
           request(request) {
     }
+    ~UserMediaRequestInfo();
     int request_id;
     // True if MediaStreamDispatcher has generated the stream, see
     // OnStreamGenerated.
     bool generated;
     WebKit::WebFrame* frame;  // WebFrame that requested the MediaStream.
     WebKit::WebMediaStream descriptor;
     WebKit::WebUserMediaRequest request;
   };
   typedef ScopedVector<UserMediaRequestInfo> UserMediaRequests;
 
@@ skipping 26 matching lines @@
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   UserMediaRequests user_media_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_