Index: content/renderer/render_thread.cc |
=================================================================== |
--- content/renderer/render_thread.cc (revision 89207) |
+++ content/renderer/render_thread.cc (working copy) |
@@ -37,6 +37,7 @@ |
#include "content/renderer/gpu/gpu_channel_host.h" |
#include "content/renderer/gpu/gpu_video_service_host.h" |
#include "content/renderer/indexed_db_dispatcher.h" |
+#include "content/renderer/media/audio_message_filter.h" |
#include "content/renderer/media/video_capture_message_filter.h" |
#include "content/renderer/media/video_capture_message_filter_creator.h" |
#include "content/renderer/plugin_channel_host.h" |
@@ -173,6 +174,9 @@ |
VideoCaptureMessageFilterCreator::SharedFilter(); |
AddFilter(video_capture_message_filter); |
+ AudioMessageFilter* audio_message_filter = AudioMessageFilter::GetInstance(); |
+ AddFilter(audio_message_filter); |
scherkus (not reviewing)
2011/06/17 17:50:10
inline the call to AudioMessageFilter::GetInstance
henrika_dont_use
2011/06/21 16:43:38
Done.
|
+ |
content::GetContentClient()->renderer()->RenderThreadStarted(); |
TRACE_EVENT_END_ETW("RenderThread::Init", 0, ""); |
@@ -194,6 +198,9 @@ |
VideoCaptureMessageFilterCreator::SharedFilter(); |
RemoveFilter(video_capture_message_filter); |
+ AudioMessageFilter* audio_message_filter = AudioMessageFilter::GetInstance(); |
+ RemoveFilter(audio_message_filter); |
scherkus (not reviewing)
2011/06/17 17:50:10
ditto?
your call
henrika_dont_use
2011/06/21 16:43:38
Done.
|
+ |
// Shutdown the file thread if it's running. |
if (file_thread_.get()) |
file_thread_->Stop(); |
@@ -433,6 +440,7 @@ |
void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) { |
EnsureWebKitInitialized(); |
+ AudioMessageFilter::GetInstance()->SetRoutingID(params.view_id); |
// When bringing in render_view, also bring in webkit's glue and jsbindings. |
RenderView::Create( |
this, |