Adding support for MediaStream and PeerConnection functionality

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index e31f376f25eb0a06e309b7af5d06b40cff6b6573..886a6b76a722daad98cd28d5df552f81a8e9c00d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -55,6 +55,8 @@
 #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_dependency_factory.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"
@@ -100,6 +102,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebPeerConnectionHandler.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebPeerConnectionHandlerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginDocument.h"
@@ -341,6 +345,7 @@ RenderViewImpl::RenderViewImpl(
       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),
@@ -395,7 +400,8 @@ RenderViewImpl::RenderViewImpl(
   host_window_ = parent_hwnd;
 
 #if defined(ENABLE_P2P_APIS)
-  p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+  if (!p2p_socket_dispatcher_)
+    p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 #endif
 
   new MHTMLGenerator(this);
@@ -407,12 +413,6 @@ RenderViewImpl::RenderViewImpl(
 
   renderer_accessibility_ = new RendererAccessibility(this);
 
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableMediaStream)) {
-    media_stream_impl_ = new MediaStreamImpl(
-        RenderThreadImpl::current()->video_capture_impl_manager());
-  }
-
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
@@ -448,6 +448,10 @@ RenderViewImpl::~RenderViewImpl() {
     DCHECK_NE(this, it->second) << "Failed to call Close?";
 #endif
 
+  // MediaStreamImpl holds weak references to RenderViewObserver objects,
+  // ensure it's deleted before the observers.
+  media_stream_impl_ = NULL;
+
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, RenderViewGone());
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnDestruct());
 }
@@ -505,6 +509,29 @@ void RenderViewImpl::SetNextPageID(int32 next_page_id) {
   next_page_id_ = next_page_id;
 }
 
+WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
+    WebKit::WebPeerConnectionHandlerClient* client) {
+  // TODO(grunell): Should be under media_stream flag here.
+#if defined(ENABLE_P2P_APIS)
+  if (!p2p_socket_dispatcher_)
+    p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+#endif
+
+  if (!media_stream_dispatcher_)
+    media_stream_dispatcher_ = new MediaStreamDispatcher(this);
+
+  MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory();
+
+  if (!media_stream_impl_.get()) {
+    media_stream_impl_ = new MediaStreamImpl(
+        media_stream_dispatcher_,
+        p2p_socket_dispatcher_,
+        RenderThreadImpl::current()->video_capture_impl_manager(),
+        factory);
+  }

[tommi (sloooow) - chröme, 2011/11/08 12:27:24]

else delete factory?
actually, shouldn't the MediaStreamDependencyFactory object only be created if
media_stream_impl_ hasn't been created?

[Henrik Grunell, 2011/11/08 22:06:41]

Of course, fixed.

+  return media_stream_impl_->CreatePeerConnectionHandler(client);
+}
+
 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
   observers_.AddObserver(observer);
 }