| 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 p2p_socket_dispatcher_ = | 691 p2p_socket_dispatcher_ = |
| 692 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); | 692 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); |
| 693 AddFilter(p2p_socket_dispatcher_.get()); | 693 AddFilter(p2p_socket_dispatcher_.get()); |
| 694 | 694 |
| 695 webrtc_identity_service_.reset(new WebRTCIdentityService()); | 695 webrtc_identity_service_.reset(new WebRTCIdentityService()); |
| 696 | 696 |
| 697 peer_connection_factory_.reset( | 697 peer_connection_factory_.reset( |
| 698 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); | 698 new PeerConnectionDependencyFactory(p2p_socket_dispatcher_.get())); |
| 699 | 699 |
| 700 aec_dump_message_filter_ = new AecDumpMessageFilter( | 700 aec_dump_message_filter_ = new AecDumpMessageFilter( |
| 701 GetIOMessageLoopProxy(), message_loop()->task_runner(), | 701 GetIOMessageLoopProxy(), message_loop()->task_runner()); |
| 702 peer_connection_factory_.get()); | |
| 703 | 702 |
| 704 AddFilter(aec_dump_message_filter_.get()); | 703 AddFilter(aec_dump_message_filter_.get()); |
| 705 | 704 |
| 706 #endif // defined(ENABLE_WEBRTC) | 705 #endif // defined(ENABLE_WEBRTC) |
| 707 | 706 |
| 708 audio_input_message_filter_ = | 707 audio_input_message_filter_ = |
| 709 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 708 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
| 710 AddFilter(audio_input_message_filter_.get()); | 709 AddFilter(audio_input_message_filter_.get()); |
| 711 | 710 |
| 712 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 711 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
| (...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2178 } | 2177 } |
| 2179 | 2178 |
| 2180 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2179 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2181 size_t erased = | 2180 size_t erased = |
| 2182 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2181 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2183 routing_id_); | 2182 routing_id_); |
| 2184 DCHECK_EQ(1u, erased); | 2183 DCHECK_EQ(1u, erased); |
| 2185 } | 2184 } |
| 2186 | 2185 |
| 2187 } // namespace content | 2186 } // namespace content |
| OLD | NEW |