| OLD | NEW |
| 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_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 p2p_socket_dispatcher_ = | 707 p2p_socket_dispatcher_ = |
| 708 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); | 708 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); |
| 709 AddFilter(p2p_socket_dispatcher_.get()); | 709 AddFilter(p2p_socket_dispatcher_.get()); |
| 710 | 710 |
| 711 webrtc_identity_service_.reset(new WebRTCIdentityService()); | 711 webrtc_identity_service_.reset(new WebRTCIdentityService()); |
| 712 | 712 |
| 713 peer_connection_factory_.reset( | 713 peer_connection_factory_.reset( |
| 714 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); | 714 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); |
| 715 | 715 |
| 716 aec_dump_message_filter_ = new AecDumpMessageFilter( | 716 aec_dump_message_filter_ = new AecDumpMessageFilter( |
| 717 GetIOMessageLoopProxy(), message_loop()->task_runner(), | 717 GetIOMessageLoopProxy(), message_loop()->task_runner()); |
| 718 peer_connection_factory_.get()); | |
| 719 | 718 |
| 720 AddFilter(aec_dump_message_filter_.get()); | 719 AddFilter(aec_dump_message_filter_.get()); |
| 721 | 720 |
| 722 #endif // defined(ENABLE_WEBRTC) | 721 #endif // defined(ENABLE_WEBRTC) |
| 723 | 722 |
| 724 audio_input_message_filter_ = | 723 audio_input_message_filter_ = |
| 725 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 724 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
| 726 AddFilter(audio_input_message_filter_.get()); | 725 AddFilter(audio_input_message_filter_.get()); |
| 727 | 726 |
| 728 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 727 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
| (...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2105 } | 2104 } |
| 2106 | 2105 |
| 2107 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2106 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2108 size_t erased = | 2107 size_t erased = |
| 2109 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2108 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2110 routing_id_); | 2109 routing_id_); |
| 2111 DCHECK_EQ(1u, erased); | 2110 DCHECK_EQ(1u, erased); |
| 2112 } | 2111 } |
| 2113 | 2112 |
| 2114 } // namespace content | 2113 } // namespace content |
| OLD | NEW |