Chromium Code Reviews| Index: content/renderer/render_view.cc |
| diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc |
| index 02d3cf26520278a392abfc310a10c485d47cd1d3..2a8db0c7ee2d16e831d58d914099f90045c1dfeb 100644 |
| --- a/content/renderer/render_view.cc |
| +++ b/content/renderer/render_view.cc |
| @@ -51,6 +51,7 @@ |
| #include "content/renderer/load_progress_tracker.h" |
| #include "content/renderer/media/audio_message_filter.h" |
| #include "content/renderer/media/audio_renderer_impl.h" |
| +#include "content/renderer/media/media_stream_dispatcher.h" |
| #include "content/renderer/media/media_stream_impl.h" |
| #include "content/renderer/media/render_media_log.h" |
| #include "content/renderer/mhtml_generator.h" |
| @@ -327,6 +328,7 @@ RenderView::RenderView(RenderThreadBase* render_thread, |
| geolocation_dispatcher_(NULL), |
| speech_input_dispatcher_(NULL), |
| device_orientation_dispatcher_(NULL), |
| + media_stream_dispatcher_(NULL), |
| p2p_socket_dispatcher_(NULL), |
| devtools_agent_(NULL), |
| renderer_accessibility_(NULL), |
| @@ -4207,6 +4209,23 @@ WebKit::WebDeviceOrientationClient* RenderView::deviceOrientationClient() { |
| return device_orientation_dispatcher_; |
| } |
| +WebKit::WebMediaStreamClient* RenderView::mediaStreamClient() { |
| +#if defined(ENABLE_P2P_APIS) |
| + p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); |
|
tommi (sloooow) - chröme
2011/10/03 12:14:14
first DCHECK that p2p_socket_dispatcher_ is NULL?
Henrik Grunell
2011/10/18 19:04:05
Added check if already created instead, since it's
|
| +#endif |
| + |
| + if (!media_stream_dispatcher_) |
| + media_stream_dispatcher_ = new MediaStreamDispatcher(this); |
| + |
| + if (!media_stream_impl_.get()) { |
| + media_stream_impl_ = new MediaStreamImpl( |
| + media_stream_dispatcher_, |
| + p2p_socket_dispatcher_, |
| + RenderThread::current()->video_capture_impl_manager()); |
| + } |
| + return media_stream_impl_.get(); |
| +} |
| + |
| void RenderView::zoomLimitsChanged(double minimum_level, double maximum_level) { |
| // For now, don't remember plugin zoom values. We don't want to mix them with |
| // normal web content (i.e. a fixed layout plugin would usually want them |