Implements AudioMessageFilter as member in RenderThread

content/renderer/render_view.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_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 #include "content/common/quota_dispatcher.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/load_progress_tracker.h"
 #include "content/renderer/media/audio_message_filter.h"

[scherkus (not reviewing), 2011/06/17 17:50:10]

I don't think we need this anymore either!

 #include "content/renderer/media/audio_renderer_impl.h"
 #include "content/renderer/navigation_state.h"
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_visitor.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
@@ skipping 338 matching lines @@
           webkit_glue::kForegroundTabTimerInterval);
 
   OnSetRendererPrefs(renderer_prefs);
 
   host_window_ = parent_hwnd;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableAccessibility))
     WebAccessibilityCache::enableAccessibility();
 
-  audio_message_filter_ = new AudioMessageFilter(routing_id_);
-  render_thread_->AddFilter(audio_message_filter_);
-
 #if defined(ENABLE_P2P_APIS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableP2PApi))
     p2p_socket_dispatcher_ = new P2PSocketDispatcher(this);
 #endif
 
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
 RenderView::~RenderView() {
   if (decrement_shared_popup_at_destruction_)
@@ skipping 11 matching lines @@
 #if defined(OS_MACOSX)
   // Destroy all fake plugin window handles on the browser side.
   while (!fake_plugin_window_handles_.empty()) {
     // Make sure no NULL plugin window handles were inserted into this list.
     DCHECK(*fake_plugin_window_handles_.begin());
     // DestroyFakePluginWindowHandle modifies fake_plugin_window_handles_.
     DestroyFakePluginWindowHandle(*fake_plugin_window_handles_.begin());
   }
 #endif
 
-  render_thread_->RemoveFilter(audio_message_filter_);
-
 #ifndef NDEBUG
   // Make sure we are no longer referenced by the ViewMap.
   ViewMap* views = g_view_map.Pointer();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
     DCHECK_NE(this, it->second) << "Failed to call Close?";
 #endif
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, set_render_view(NULL));
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnDestruct());
 }
@@ skipping 894 matching lines @@
     return WebStorageNamespace::createSessionStorageNamespace(quota);
   CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId);
   return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION,
                                              session_storage_namespace_id_);
 }
 
 void RenderView::didAddMessageToConsole(
     const WebConsoleMessage& message, const WebString& source_name,
     unsigned source_line) {
   logging::LogSeverity log_severity = logging::LOG_VERBOSE;
-  switch(message.level) {
+  switch (message.level) {
     case WebConsoleMessage::LevelTip:
       log_severity = logging::LOG_VERBOSE;
       break;
     case WebConsoleMessage::LevelLog:
       log_severity = logging::LOG_INFO;
       break;
     case WebConsoleMessage::LevelWarning:
       log_severity = logging::LOG_WARNING;
       break;
     case WebConsoleMessage::LevelError:
@@ skipping 516 matching lines @@
 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory(
       new media::MessageLoopFactoryImpl());
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // Add the chrome specific audio renderer.
-    collection->AddAudioRenderer(new AudioRendererImpl(audio_message_filter()));
+    collection->AddAudioRenderer(new AudioRendererImpl());
   }
 
   scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
   bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
   scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
       new webkit_glue::VideoRendererImpl(pts_logging));
   collection->AddVideoRenderer(renderer);
   video_renderer = renderer;
 
   scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
@@ skipping 2340 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }