| 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 <vector> | 10 #include <vector> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 #endif | 105 #endif |
| 105 | 106 |
| 106 using WebKit::WebDocument; | 107 using WebKit::WebDocument; |
| 107 using WebKit::WebFrame; | 108 using WebKit::WebFrame; |
| 108 using WebKit::WebNetworkStateNotifier; | 109 using WebKit::WebNetworkStateNotifier; |
| 109 using WebKit::WebRuntimeFeatures; | 110 using WebKit::WebRuntimeFeatures; |
| 110 using WebKit::WebScriptController; | 111 using WebKit::WebScriptController; |
| 111 using WebKit::WebSecurityPolicy; | 112 using WebKit::WebSecurityPolicy; |
| 112 using WebKit::WebString; | 113 using WebKit::WebString; |
| 113 using WebKit::WebView; | 114 using WebKit::WebView; |
| 115 using content::AudioRendererMixerManager; |
| 114 using content::RenderProcessObserver; | 116 using content::RenderProcessObserver; |
| 115 | 117 |
| 116 namespace { | 118 namespace { |
| 117 | 119 |
| 118 const int64 kInitialIdleHandlerDelayMs = 1000; | 120 const int64 kInitialIdleHandlerDelayMs = 1000; |
| 119 const int64 kShortIdleHandlerDelayMs = 1000; | 121 const int64 kShortIdleHandlerDelayMs = 1000; |
| 120 const int64 kLongIdleHandlerDelayMs = 30*1000; | 122 const int64 kLongIdleHandlerDelayMs = 30*1000; |
| 121 const int kIdleCPUUsageThresholdInPercents = 3; | 123 const int kIdleCPUUsageThresholdInPercents = 3; |
| 122 | 124 |
| 123 // Keep the global RenderThreadImpl in a TLS slot so it is impossible to access | 125 // Keep the global RenderThreadImpl in a TLS slot so it is impossible to access |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 AddFilter(audio_input_message_filter_.get()); | 240 AddFilter(audio_input_message_filter_.get()); |
| 239 | 241 |
| 240 audio_message_filter_ = new AudioMessageFilter(); | 242 audio_message_filter_ = new AudioMessageFilter(); |
| 241 AddFilter(audio_message_filter_.get()); | 243 AddFilter(audio_message_filter_.get()); |
| 242 | 244 |
| 243 devtools_agent_message_filter_ = new DevToolsAgentFilter(); | 245 devtools_agent_message_filter_ = new DevToolsAgentFilter(); |
| 244 AddFilter(devtools_agent_message_filter_.get()); | 246 AddFilter(devtools_agent_message_filter_.get()); |
| 245 | 247 |
| 246 AddFilter(new IndexedDBMessageFilter); | 248 AddFilter(new IndexedDBMessageFilter); |
| 247 | 249 |
| 250 audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager()); |
| 251 |
| 248 content::GetContentClient()->renderer()->RenderThreadStarted(); | 252 content::GetContentClient()->renderer()->RenderThreadStarted(); |
| 249 | 253 |
| 250 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 254 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 251 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 255 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
| 252 RegisterExtension(content::GpuBenchmarkingExtension::Get()); | 256 RegisterExtension(content::GpuBenchmarkingExtension::Get()); |
| 253 | 257 |
| 254 #if defined(WEBCOMPOSITOR_OWNS_SETTINGS) | 258 #if defined(WEBCOMPOSITOR_OWNS_SETTINGS) |
| 255 WebKit::WebCompositor::setAcceleratedAnimationEnabled( | 259 WebKit::WebCompositor::setAcceleratedAnimationEnabled( |
| 256 !command_line.HasSwitch(switches::kDisableThreadedAnimation)); | 260 !command_line.HasSwitch(switches::kDisableThreadedAnimation)); |
| 257 WebKit::WebCompositor::setPerTilePaintingEnabled( | 261 WebKit::WebCompositor::setPerTilePaintingEnabled( |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 | 1034 |
| 1031 scoped_refptr<base::MessageLoopProxy> | 1035 scoped_refptr<base::MessageLoopProxy> |
| 1032 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1036 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 1033 DCHECK(message_loop() == MessageLoop::current()); | 1037 DCHECK(message_loop() == MessageLoop::current()); |
| 1034 if (!file_thread_.get()) { | 1038 if (!file_thread_.get()) { |
| 1035 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1039 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 1036 file_thread_->Start(); | 1040 file_thread_->Start(); |
| 1037 } | 1041 } |
| 1038 return file_thread_->message_loop_proxy(); | 1042 return file_thread_->message_loop_proxy(); |
| 1039 } | 1043 } |
| OLD | NEW |