Adding support for MediaStream and PeerConnection functionality.

content/renderer/render_view.cc

 // Copyright (c) 2011 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.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 34 matching lines @@
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/mhtml_generator.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/intents_dispatcher.h"
 #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/navigation_state.h"
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_visitor.h"
@@ skipping 314 matching lines @@
       cached_is_main_frame_pinned_to_left_(false),
       cached_is_main_frame_pinned_to_right_(false),
       cached_has_main_frame_horizontal_scrollbar_(false),
       cached_has_main_frame_vertical_scrollbar_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
+      media_stream_dispatcher_(NULL),
       accessibility_ack_pending_(false),
       accessibility_logging_(false),
       p2p_socket_dispatcher_(NULL),
       devtools_agent_(NULL),
       session_storage_namespace_id_(session_storage_namespace_id),
       handling_select_range_(false) {
   routing_id_ = routing_id;
   if (opener_id != MSG_ROUTING_NONE)
     opener_id_ = opener_id;
 
@@ skipping 46 matching lines @@
   p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 #endif
 
   new MHTMLGenerator(this);
 #if defined(OS_MACOSX)
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
   devtools_agent_ = new DevToolsAgent(this);
 
-  if (command_line.HasSwitch(switches::kEnableMediaStream)) {
-    media_stream_impl_ = new MediaStreamImpl(
-        RenderThread::current()->video_capture_impl_manager());
-  }
-
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
 RenderView::~RenderView() {
   history_page_ids_.clear();
 
   if (decrement_shared_popup_at_destruction_)
     shared_popup_counter_->data--;
 
   // If file chooser is still waiting for answer, dispatch empty answer.
@@ skipping 3977 matching lines @@
     speech_input_dispatcher_ = new SpeechInputDispatcher(this, listener);
   return speech_input_dispatcher_;
 }
 
 WebKit::WebDeviceOrientationClient* RenderView::deviceOrientationClient() {
   if (!device_orientation_dispatcher_)
     device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this);
   return device_orientation_dispatcher_;
 }
 
+WebKit::WebMediaStreamClient* RenderView::mediaStreamClient() {
+#if defined(ENABLE_P2P_APIS)
+  p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+#endif
+
+  if (!media_stream_dispatcher_)
+    media_stream_dispatcher_ = new MediaStreamDispatcher(this);
+
+  if (!media_stream_impl_.get())

[tommi (sloooow) - chröme, 2011/09/23 13:02:42]

braces.  basically the only time chromium doesn't use braces for if statements
is when they span only two lines.

[grunell (dont use), 2011/09/29 13:38:17]

Done.

+    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
   // different).
   bool remember = !webview()->mainFrame()->document().isPluginDocument();
 
   int minimum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(minimum_level) * 100);
   int maximum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(maximum_level) * 100);
@@ skipping 177 matching lines @@
 }
 
 void RenderView::OnLockMouseACK(bool succeeded) {
   pepper_delegate_.OnLockMouseACK(succeeded);
 }
 
 void RenderView::OnMouseLockLost() {
   pepper_delegate_.OnMouseLockLost();
 }