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 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
722 | 722 |
723 #endif // defined(ENABLE_WEBRTC) | 723 #endif // defined(ENABLE_WEBRTC) |
724 | 724 |
725 audio_input_message_filter_ = | 725 audio_input_message_filter_ = |
726 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 726 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
727 AddFilter(audio_input_message_filter_.get()); | 727 AddFilter(audio_input_message_filter_.get()); |
728 | 728 |
729 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 729 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
730 AddFilter(audio_message_filter_.get()); | 730 AddFilter(audio_message_filter_.get()); |
731 | 731 |
| 732 audio_message_filter_->SetAudioOutputClient( |
| 733 new AudioOutputClient(GetServiceRegistry(), audio_message_filter_.get())); |
| 734 |
732 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); | 735 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); |
733 AddFilter(midi_message_filter_.get()); | 736 AddFilter(midi_message_filter_.get()); |
734 | 737 |
735 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender()); | 738 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender()); |
736 AddFilter(bluetooth_message_filter_->GetFilter()); | 739 AddFilter(bluetooth_message_filter_->GetFilter()); |
737 | 740 |
738 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); | 741 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); |
739 | 742 |
740 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); | 743 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); |
741 | 744 |
(...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2142 } | 2145 } |
2143 | 2146 |
2144 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2147 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2145 size_t erased = | 2148 size_t erased = |
2146 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2149 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2147 routing_id_); | 2150 routing_id_); |
2148 DCHECK_EQ(1u, erased); | 2151 DCHECK_EQ(1u, erased); |
2149 } | 2152 } |
2150 | 2153 |
2151 } // namespace content | 2154 } // namespace content |
OLD | NEW |