| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 57 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
| 58 #include "content/renderer/gpu/input_handler_manager.h" | 58 #include "content/renderer/gpu/input_handler_manager.h" |
| 59 #include "content/renderer/media/audio_input_message_filter.h" | 59 #include "content/renderer/media/audio_input_message_filter.h" |
| 60 #include "content/renderer/media/audio_message_filter.h" | 60 #include "content/renderer/media/audio_message_filter.h" |
| 61 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 61 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| 62 #include "content/renderer/media/media_stream_center.h" | 62 #include "content/renderer/media/media_stream_center.h" |
| 63 #include "content/renderer/media/media_stream_dependency_factory.h" | 63 #include "content/renderer/media/media_stream_dependency_factory.h" |
| 64 #include "content/renderer/media/peer_connection_tracker.h" | 64 #include "content/renderer/media/peer_connection_tracker.h" |
| 65 #include "content/renderer/media/video_capture_impl_manager.h" | 65 #include "content/renderer/media/video_capture_impl_manager.h" |
| 66 #include "content/renderer/media/video_capture_message_filter.h" | 66 #include "content/renderer/media/video_capture_message_filter.h" |
| 67 #include "content/renderer/media/webrtc_logging_message_filter.h" | |
| 68 #include "content/renderer/memory_benchmarking_extension.h" | 67 #include "content/renderer/memory_benchmarking_extension.h" |
| 69 #include "content/renderer/p2p/socket_dispatcher.h" | 68 #include "content/renderer/p2p/socket_dispatcher.h" |
| 70 #include "content/renderer/plugin_channel_host.h" | 69 #include "content/renderer/plugin_channel_host.h" |
| 71 #include "content/renderer/render_process_impl.h" | 70 #include "content/renderer/render_process_impl.h" |
| 72 #include "content/renderer/render_view_impl.h" | 71 #include "content/renderer/render_view_impl.h" |
| 73 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 72 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 74 #include "content/renderer/skia_benchmarking_extension.h" | 73 #include "content/renderer/skia_benchmarking_extension.h" |
| 75 #include "grit/content_resources.h" | 74 #include "grit/content_resources.h" |
| 76 #include "ipc/ipc_channel_handle.h" | 75 #include "ipc/ipc_channel_handle.h" |
| 77 #include "ipc/ipc_forwarding_message_filter.h" | 76 #include "ipc/ipc_forwarding_message_filter.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 | 377 |
| 379 audio_input_message_filter_ = | 378 audio_input_message_filter_ = |
| 380 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 379 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
| 381 AddFilter(audio_input_message_filter_.get()); | 380 AddFilter(audio_input_message_filter_.get()); |
| 382 | 381 |
| 383 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 382 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
| 384 AddFilter(audio_message_filter_.get()); | 383 AddFilter(audio_message_filter_.get()); |
| 385 | 384 |
| 386 AddFilter(new IndexedDBMessageFilter); | 385 AddFilter(new IndexedDBMessageFilter); |
| 387 | 386 |
| 388 #if defined(ENABLE_WEBRTC) | |
| 389 webrtc_logging_message_filter_ = | |
| 390 new WebRtcLoggingMessageFilter(GetIOMessageLoopProxy()); | |
| 391 AddFilter(webrtc_logging_message_filter_.get()); | |
| 392 #endif | |
| 393 | |
| 394 GetContentClient()->renderer()->RenderThreadStarted(); | 387 GetContentClient()->renderer()->RenderThreadStarted(); |
| 395 | 388 |
| 396 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 389 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 397 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 390 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
| 398 RegisterExtension(GpuBenchmarkingExtension::Get()); | 391 RegisterExtension(GpuBenchmarkingExtension::Get()); |
| 399 | 392 |
| 400 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 393 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
| 401 RegisterExtension(MemoryBenchmarkingExtension::Get()); | 394 RegisterExtension(MemoryBenchmarkingExtension::Get()); |
| 402 | 395 |
| 403 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) { | 396 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) { |
| (...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1317 | 1310 |
| 1318 void RenderThreadImpl::SetFlingCurveParameters( | 1311 void RenderThreadImpl::SetFlingCurveParameters( |
| 1319 const std::vector<float>& new_touchpad, | 1312 const std::vector<float>& new_touchpad, |
| 1320 const std::vector<float>& new_touchscreen) { | 1313 const std::vector<float>& new_touchscreen) { |
| 1321 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1314 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1322 new_touchscreen); | 1315 new_touchscreen); |
| 1323 | 1316 |
| 1324 } | 1317 } |
| 1325 | 1318 |
| 1326 } // namespace content | 1319 } // namespace content |
| OLD | NEW |