Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9369022: disable media stream creation when enable_webrtc=0 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: code review Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/media/media_stream_impl_stub.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 497
498 OnSetRendererPrefs(renderer_prefs); 498 OnSetRendererPrefs(renderer_prefs);
499 499
500 host_window_ = parent_hwnd; 500 host_window_ = parent_hwnd;
501 501
502 #if defined(ENABLE_P2P_APIS) 502 #if defined(ENABLE_P2P_APIS)
503 if (!p2p_socket_dispatcher_) 503 if (!p2p_socket_dispatcher_)
504 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); 504 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
505 #endif 505 #endif
506 506
507 #if defined(ENABLE_WEBRTC)
507 if (!media_stream_dispatcher_) 508 if (!media_stream_dispatcher_)
508 media_stream_dispatcher_ = new MediaStreamDispatcher(this); 509 media_stream_dispatcher_ = new MediaStreamDispatcher(this);
510 #endif
509 511
510 new MHTMLGenerator(this); 512 new MHTMLGenerator(this);
511 #if defined(OS_MACOSX) 513 #if defined(OS_MACOSX)
512 new TextInputClientObserver(this); 514 new TextInputClientObserver(this);
513 #endif // defined(OS_MACOSX) 515 #endif // defined(OS_MACOSX)
514 516
515 // The next group of objects all implement RenderViewObserver, so are deleted 517 // The next group of objects all implement RenderViewObserver, so are deleted
516 // along with the RenderView automatically. 518 // along with the RenderView automatically.
517 devtools_agent_ = new DevToolsAgent(this); 519 devtools_agent_ = new DevToolsAgent(this);
518 renderer_accessibility_ = new RendererAccessibility(this); 520 renderer_accessibility_ = new RendererAccessibility(this);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 frame_name, 617 frame_name,
616 next_page_id); // adds reference 618 next_page_id); // adds reference
617 } 619 }
618 620
619 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( 621 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
620 WebKit::WebPeerConnectionHandlerClient* client) { 622 WebKit::WebPeerConnectionHandlerClient* client) {
621 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 623 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
622 if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) 624 if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
623 return NULL; 625 return NULL;
624 EnsureMediaStreamImpl(); 626 EnsureMediaStreamImpl();
627 if (!media_stream_impl_.get())
628 return NULL;
625 return media_stream_impl_->CreatePeerConnectionHandler(client); 629 return media_stream_impl_->CreatePeerConnectionHandler(client);
626 } 630 }
627 631
628 void RenderViewImpl::AddObserver(RenderViewObserver* observer) { 632 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
629 observers_.AddObserver(observer); 633 observers_.AddObserver(observer);
630 } 634 }
631 635
632 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { 636 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
633 observer->RenderViewGone(); 637 observer->RenderViewGone();
634 observers_.RemoveObserver(observer); 638 observers_.RemoveObserver(observer);
(...skipping 2504 matching lines...) Expand 10 before | Expand all | Expand 10 after
3139 Send(new ViewHostMsg_DidContentsPreferredSizeChange(routing_id_, 3143 Send(new ViewHostMsg_DidContentsPreferredSizeChange(routing_id_,
3140 preferred_size_)); 3144 preferred_size_));
3141 } 3145 }
3142 3146
3143 void RenderViewImpl::EnsureMediaStreamImpl() { 3147 void RenderViewImpl::EnsureMediaStreamImpl() {
3144 #if defined(ENABLE_P2P_APIS) 3148 #if defined(ENABLE_P2P_APIS)
3145 if (!p2p_socket_dispatcher_) 3149 if (!p2p_socket_dispatcher_)
3146 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); 3150 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
3147 #endif 3151 #endif
3148 3152
3153 #if defined(ENABLE_WEBRTC)
3149 if (!media_stream_dispatcher_) 3154 if (!media_stream_dispatcher_)
3150 media_stream_dispatcher_ = new MediaStreamDispatcher(this); 3155 media_stream_dispatcher_ = new MediaStreamDispatcher(this);
3151 3156
3152 if (!media_stream_impl_.get()) { 3157 if (!media_stream_impl_.get()) {
3153 MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory(); 3158 MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory();
3154 media_stream_impl_ = new MediaStreamImpl( 3159 media_stream_impl_ = new MediaStreamImpl(
3155 media_stream_dispatcher_, 3160 media_stream_dispatcher_,
3156 p2p_socket_dispatcher_, 3161 p2p_socket_dispatcher_,
3157 RenderThreadImpl::current()->video_capture_impl_manager(), 3162 RenderThreadImpl::current()->video_capture_impl_manager(),
3158 factory); 3163 factory);
3159 } 3164 }
3165 #endif
3160 } 3166 }
3161 3167
3162 void RenderViewImpl::didChangeContentsSize(WebFrame* frame, 3168 void RenderViewImpl::didChangeContentsSize(WebFrame* frame,
3163 const WebSize& size) { 3169 const WebSize& size) {
3164 if (webview()->mainFrame() != frame) 3170 if (webview()->mainFrame() != frame)
3165 return; 3171 return;
3166 WebView* frameView = frame->view(); 3172 WebView* frameView = frame->view();
3167 if (!frameView) 3173 if (!frameView)
3168 return; 3174 return;
3169 3175
(...skipping 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after
5028 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5034 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5029 return !!RenderThreadImpl::current()->compositor_thread(); 5035 return !!RenderThreadImpl::current()->compositor_thread();
5030 } 5036 }
5031 5037
5032 void RenderViewImpl::OnJavaBridgeInit() { 5038 void RenderViewImpl::OnJavaBridgeInit() {
5033 DCHECK(!java_bridge_dispatcher_.get()); 5039 DCHECK(!java_bridge_dispatcher_.get());
5034 #if defined(ENABLE_JAVA_BRIDGE) 5040 #if defined(ENABLE_JAVA_BRIDGE)
5035 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5041 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5036 #endif 5042 #endif
5037 } 5043 }
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_impl_stub.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698