Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 244bf8be6b201de4de772bee5dc76dd955555ba1..38a519673e179e07e1c740e1d77908349b8e4c71 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -58,6 +58,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" |
@@ -103,6 +105,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" |
@@ -123,6 +127,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" |
@@ -351,6 +356,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), |
@@ -405,7 +411,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); |
@@ -417,12 +424,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); |
} |
@@ -458,6 +459,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()); |
} |
@@ -516,6 +521,15 @@ void RenderViewImpl::SetNextPageID(int32 next_page_id) { |
next_page_id_ = next_page_id; |
} |
+WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( |
+ WebKit::WebPeerConnectionHandlerClient* client) { |
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
+ if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) |
+ return NULL; |
+ CreateMediaStreamImpl(); |
+ return media_stream_impl_->CreatePeerConnectionHandler(client); |
+} |
+ |
void RenderViewImpl::AddObserver(RenderViewObserver* observer) { |
observers_.AddObserver(observer); |
} |
@@ -2880,6 +2894,25 @@ void RenderViewImpl::CheckPreferredSize() { |
preferred_size_)); |
} |
+void RenderViewImpl::CreateMediaStreamImpl() { |
darin (slow to review)
2011/11/23 22:26:36
In chromium, we often use the verb "Ensure" instea
Henrik Grunell
2011/11/24 11:32:59
Done.
|
+#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); |
+ |
+ if (!media_stream_impl_.get()) { |
+ MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory(); |
+ media_stream_impl_ = new MediaStreamImpl( |
+ media_stream_dispatcher_, |
+ p2p_socket_dispatcher_, |
+ RenderThreadImpl::current()->video_capture_impl_manager(), |
+ factory); |
+ } |
+} |
+ |
void RenderViewImpl::didChangeContentsSize(WebFrame* frame, |
const WebSize& size) { |
if (webview()->mainFrame() != frame) |
@@ -4608,6 +4641,14 @@ void RenderViewImpl::startActivity(const WebKit::WebString& action, |
routing_id_, intent_data, intent_id)); |
} |
+WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() { |
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
+ if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) |
+ return NULL; |
+ CreateMediaStreamImpl(); |
+ return media_stream_impl_; |
+} |
+ |
bool RenderViewImpl::IsNonLocalTopLevelNavigation( |
const GURL& url, WebKit::WebFrame* frame, WebKit::WebNavigationType type) { |
// Must be a top level frame. |