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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
675 | 675 |
676 #endif // defined(ENABLE_WEBRTC) | 676 #endif // defined(ENABLE_WEBRTC) |
677 | 677 |
678 audio_input_message_filter_ = | 678 audio_input_message_filter_ = |
679 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 679 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
680 AddFilter(audio_input_message_filter_.get()); | 680 AddFilter(audio_input_message_filter_.get()); |
681 | 681 |
682 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 682 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
683 AddFilter(audio_message_filter_.get()); | 683 AddFilter(audio_message_filter_.get()); |
684 | 684 |
| 685 audio_message_filter_->SetAudioOutputClient( |
| 686 new AudioOutputClient(GetServiceRegistry(), audio_message_filter_)); |
| 687 |
685 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); | 688 midi_message_filter_ = new MidiMessageFilter(GetIOMessageLoopProxy()); |
686 AddFilter(midi_message_filter_.get()); | 689 AddFilter(midi_message_filter_.get()); |
687 | 690 |
688 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender()); | 691 bluetooth_message_filter_ = new BluetoothMessageFilter(thread_safe_sender()); |
689 AddFilter(bluetooth_message_filter_->GetFilter()); | 692 AddFilter(bluetooth_message_filter_->GetFilter()); |
690 | 693 |
691 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); | 694 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); |
692 | 695 |
693 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); | 696 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); |
694 | 697 |
(...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2048 } | 2051 } |
2049 | 2052 |
2050 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2053 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2051 size_t erased = | 2054 size_t erased = |
2052 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2055 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2053 routing_id_); | 2056 routing_id_); |
2054 DCHECK_EQ(1u, erased); | 2057 DCHECK_EQ(1u, erased); |
2055 } | 2058 } |
2056 | 2059 |
2057 } // namespace content | 2060 } // namespace content |
OLD | NEW |