Implements AudioMessageFilter as member in RenderThread

content/renderer/render_thread.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 19 matching lines @@
 #include "content/common/plugin_messages.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/common/web_database_observer_impl.h"
 #include "content/plugin/npobject_util.h"
 #include "content/renderer/content_renderer_client.h"
 #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"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_process_observer.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/render_view_visitor.h"
 #include "content/renderer/renderer_webidbfactory_impl.h"
 #include "content/renderer/renderer_webkitclient_impl.h"
 #include "ipc/ipc_channel_handle.h"
@@ skipping 116 matching lines @@
   appcache_dispatcher_.reset(new AppCacheDispatcher(this));
   indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
 
   db_message_filter_ = new DBMessageFilter();
   AddFilter(db_message_filter_.get());
 
   VideoCaptureMessageFilter* video_capture_message_filter =
       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, "");
 }
 
 RenderThread::~RenderThread() {
   FOR_EACH_OBSERVER(
       RenderProcessObserver, observers_, OnRenderProcessShutdown());
 
   // Wait for all databases to be closed.
   if (web_database_observer_impl_.get())
     web_database_observer_impl_->WaitForAllDatabasesToClose();
 
   // Shutdown in reverse of the initialization order.
   RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
 
   VideoCaptureMessageFilter* video_capture_message_filter =
       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();
 
   if (webkit_client_.get())
     WebKit::shutdown();
 
   lazy_tls.Pointer()->Set(NULL);
 
   // TODO(port)
@@ skipping 219 matching lines @@
        it != colors.end();
        ++it, ++i) {
     color_names[i] = it->first;
     web_colors[i] = it->second;
   }
   WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors);
 }
 
 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,
       params.parent_window,
       params.compositing_surface,
       MSG_ROUTING_NONE,
       params.renderer_preferences,
       params.web_preferences,
       new SharedRenderViewCounter(0),
       params.view_id,
@@ skipping 232 matching lines @@
 
 void RenderThread::RegisterExtension(v8::Extension* extension) {
   WebScriptController::registerExtension(extension);
   v8_extensions_.insert(extension->name());
 }
 
 bool RenderThread::IsRegisteredExtension(
     const std::string& v8_extension_name) const {
   return v8_extensions_.find(v8_extension_name) != v8_extensions_.end();
 }