| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/media/webrtc/peer_connection_dependency_factory.h" | 5 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 } | 379 } |
| 380 | 380 |
| 381 const GURL& requesting_origin = | 381 const GURL& requesting_origin = |
| 382 GURL(web_frame->document().url()).GetOrigin(); | 382 GURL(web_frame->document().url()).GetOrigin(); |
| 383 | 383 |
| 384 std::unique_ptr<rtc::NetworkManager> network_manager; | 384 std::unique_ptr<rtc::NetworkManager> network_manager; |
| 385 if (port_config.enable_multiple_routes) { | 385 if (port_config.enable_multiple_routes) { |
| 386 FilteringNetworkManager* filtering_network_manager = | 386 FilteringNetworkManager* filtering_network_manager = |
| 387 new FilteringNetworkManager(network_manager_, requesting_origin, | 387 new FilteringNetworkManager(network_manager_, requesting_origin, |
| 388 media_permission); | 388 media_permission); |
| 389 if (media_permission) { | |
| 390 // Start permission check earlier to reduce any impact to call set up | |
| 391 // time. It's safe to use Unretained here since both destructor and | |
| 392 // Initialize can only be called on the worker thread. | |
| 393 chrome_worker_thread_.task_runner()->PostTask( | |
| 394 FROM_HERE, base::Bind(&FilteringNetworkManager::CheckPermission, | |
| 395 base::Unretained(filtering_network_manager))); | |
| 396 } | |
| 397 network_manager.reset(filtering_network_manager); | 389 network_manager.reset(filtering_network_manager); |
| 398 } else { | 390 } else { |
| 399 network_manager.reset(new EmptyNetworkManager(network_manager_)); | 391 network_manager.reset(new EmptyNetworkManager(network_manager_)); |
| 400 } | 392 } |
| 401 std::unique_ptr<P2PPortAllocator> port_allocator(new P2PPortAllocator( | 393 std::unique_ptr<P2PPortAllocator> port_allocator(new P2PPortAllocator( |
| 402 p2p_socket_dispatcher_, std::move(network_manager), socket_factory_.get(), | 394 p2p_socket_dispatcher_, std::move(network_manager), socket_factory_.get(), |
| 403 port_config, requesting_origin)); | 395 port_config, requesting_origin)); |
| 404 | 396 |
| 405 return GetPcFactory() | 397 return GetPcFactory() |
| 406 ->CreatePeerConnection(config, std::move(port_allocator), | 398 ->CreatePeerConnection(config, std::move(port_allocator), |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 | 568 |
| 577 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() { | 569 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() { |
| 578 DCHECK(CalledOnValidThread()); | 570 DCHECK(CalledOnValidThread()); |
| 579 if (audio_device_.get()) | 571 if (audio_device_.get()) |
| 580 return; | 572 return; |
| 581 | 573 |
| 582 audio_device_ = new WebRtcAudioDeviceImpl(); | 574 audio_device_ = new WebRtcAudioDeviceImpl(); |
| 583 } | 575 } |
| 584 | 576 |
| 585 } // namespace content | 577 } // namespace content |
| OLD | NEW |