Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 10636036: Enable renderer side mixing behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renderer Side Mixing! Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <vector> 10 #include <vector>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h" 50 #include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h"
51 #include "content/renderer/browser_plugin/old/browser_plugin_registry.h" 51 #include "content/renderer/browser_plugin/old/browser_plugin_registry.h"
52 #include "content/renderer/devtools_agent_filter.h" 52 #include "content/renderer/devtools_agent_filter.h"
53 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" 53 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
54 #include "content/renderer/dom_storage/webstoragearea_impl.h" 54 #include "content/renderer/dom_storage/webstoragearea_impl.h"
55 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 55 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
56 #include "content/renderer/gpu/compositor_thread.h" 56 #include "content/renderer/gpu/compositor_thread.h"
57 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 57 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
58 #include "content/renderer/media/audio_input_message_filter.h" 58 #include "content/renderer/media/audio_input_message_filter.h"
59 #include "content/renderer/media/audio_message_filter.h" 59 #include "content/renderer/media/audio_message_filter.h"
60 #include "content/renderer/media/audio_renderer_mixer_manager.h"
60 #include "content/renderer/media/media_stream_center.h" 61 #include "content/renderer/media/media_stream_center.h"
61 #include "content/renderer/media/video_capture_impl_manager.h" 62 #include "content/renderer/media/video_capture_impl_manager.h"
62 #include "content/renderer/media/video_capture_message_filter.h" 63 #include "content/renderer/media/video_capture_message_filter.h"
63 #include "content/renderer/plugin_channel_host.h" 64 #include "content/renderer/plugin_channel_host.h"
64 #include "content/renderer/render_process_impl.h" 65 #include "content/renderer/render_process_impl.h"
65 #include "content/renderer/render_view_impl.h" 66 #include "content/renderer/render_view_impl.h"
66 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 67 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
67 #include "grit/content_resources.h" 68 #include "grit/content_resources.h"
68 #include "ipc/ipc_channel_handle.h" 69 #include "ipc/ipc_channel_handle.h"
69 #include "ipc/ipc_platform_file.h" 70 #include "ipc/ipc_platform_file.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 AddFilter(audio_input_message_filter_.get()); 239 AddFilter(audio_input_message_filter_.get());
239 240
240 audio_message_filter_ = new AudioMessageFilter(); 241 audio_message_filter_ = new AudioMessageFilter();
241 AddFilter(audio_message_filter_.get()); 242 AddFilter(audio_message_filter_.get());
242 243
243 devtools_agent_message_filter_ = new DevToolsAgentFilter(); 244 devtools_agent_message_filter_ = new DevToolsAgentFilter();
244 AddFilter(devtools_agent_message_filter_.get()); 245 AddFilter(devtools_agent_message_filter_.get());
245 246
246 AddFilter(new IndexedDBMessageFilter); 247 AddFilter(new IndexedDBMessageFilter);
247 248
249 audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager());
250
248 content::GetContentClient()->renderer()->RenderThreadStarted(); 251 content::GetContentClient()->renderer()->RenderThreadStarted();
249 252
250 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 253 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
251 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) 254 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking))
252 RegisterExtension(content::GpuBenchmarkingExtension::Get()); 255 RegisterExtension(content::GpuBenchmarkingExtension::Get());
253 256
254 #if defined(WEBCOMPOSITOR_OWNS_SETTINGS) 257 #if defined(WEBCOMPOSITOR_OWNS_SETTINGS)
255 WebKit::WebCompositor::setAcceleratedAnimationEnabled( 258 WebKit::WebCompositor::setAcceleratedAnimationEnabled(
256 !command_line.HasSwitch(switches::kDisableThreadedAnimation)); 259 !command_line.HasSwitch(switches::kDisableThreadedAnimation));
257 WebKit::WebCompositor::setPerTilePaintingEnabled( 260 WebKit::WebCompositor::setPerTilePaintingEnabled(
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 1032
1030 scoped_refptr<base::MessageLoopProxy> 1033 scoped_refptr<base::MessageLoopProxy>
1031 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 1034 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
1032 DCHECK(message_loop() == MessageLoop::current()); 1035 DCHECK(message_loop() == MessageLoop::current());
1033 if (!file_thread_.get()) { 1036 if (!file_thread_.get()) {
1034 file_thread_.reset(new base::Thread("Renderer::FILE")); 1037 file_thread_.reset(new base::Thread("Renderer::FILE"));
1035 file_thread_->Start(); 1038 file_thread_->Start();
1036 } 1039 }
1037 return file_thread_->message_loop_proxy(); 1040 return file_thread_->message_loop_proxy();
1038 } 1041 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698