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/dom_storage/webstoragenamespace_impl.h" | 57 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
58 #include "content/renderer/gpu/compositor_output_surface.h" | 58 #include "content/renderer/gpu/compositor_output_surface.h" |
59 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 59 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
60 #include "content/renderer/gpu/input_event_filter.h" | 60 #include "content/renderer/gpu/input_event_filter.h" |
61 #include "content/renderer/gpu/input_handler_manager.h" | 61 #include "content/renderer/gpu/input_handler_manager.h" |
62 #include "content/renderer/media/audio_input_message_filter.h" | 62 #include "content/renderer/media/audio_input_message_filter.h" |
63 #include "content/renderer/media/audio_message_filter.h" | 63 #include "content/renderer/media/audio_message_filter.h" |
64 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 64 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
65 #include "content/renderer/media/media_stream_center.h" | 65 #include "content/renderer/media/media_stream_center.h" |
66 #include "content/renderer/media/media_stream_dependency_factory.h" | 66 #include "content/renderer/media/media_stream_dependency_factory.h" |
| 67 #include "content/renderer/media/midi_message_filter.h" |
67 #include "content/renderer/media/peer_connection_tracker.h" | 68 #include "content/renderer/media/peer_connection_tracker.h" |
68 #include "content/renderer/media/video_capture_impl_manager.h" | 69 #include "content/renderer/media/video_capture_impl_manager.h" |
69 #include "content/renderer/media/video_capture_message_filter.h" | 70 #include "content/renderer/media/video_capture_message_filter.h" |
70 #include "content/renderer/memory_benchmarking_extension.h" | 71 #include "content/renderer/memory_benchmarking_extension.h" |
71 #include "content/renderer/p2p/socket_dispatcher.h" | 72 #include "content/renderer/p2p/socket_dispatcher.h" |
72 #include "content/renderer/plugin_channel_host.h" | 73 #include "content/renderer/plugin_channel_host.h" |
73 #include "content/renderer/render_process_impl.h" | 74 #include "content/renderer/render_process_impl.h" |
74 #include "content/renderer/render_view_impl.h" | 75 #include "content/renderer/render_view_impl.h" |
75 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 76 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
76 #include "content/renderer/skia_benchmarking_extension.h" | 77 #include "content/renderer/skia_benchmarking_extension.h" |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 vc_manager_ = new VideoCaptureImplManager(); | 385 vc_manager_ = new VideoCaptureImplManager(); |
385 AddFilter(vc_manager_->video_capture_message_filter()); | 386 AddFilter(vc_manager_->video_capture_message_filter()); |
386 | 387 |
387 audio_input_message_filter_ = | 388 audio_input_message_filter_ = |
388 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 389 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
389 AddFilter(audio_input_message_filter_.get()); | 390 AddFilter(audio_input_message_filter_.get()); |
390 | 391 |
391 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 392 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
392 AddFilter(audio_message_filter_.get()); | 393 AddFilter(audio_message_filter_.get()); |
393 | 394 |
| 395 midi_message_filter_ = new MIDIMessageFilter(GetIOMessageLoopProxy()); |
| 396 AddFilter(midi_message_filter_.get()); |
| 397 |
394 AddFilter(new IndexedDBMessageFilter); | 398 AddFilter(new IndexedDBMessageFilter); |
395 | 399 |
396 GetContentClient()->renderer()->RenderThreadStarted(); | 400 GetContentClient()->renderer()->RenderThreadStarted(); |
397 | 401 |
398 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 402 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
399 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 403 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
400 RegisterExtension(GpuBenchmarkingExtension::Get()); | 404 RegisterExtension(GpuBenchmarkingExtension::Get()); |
401 | 405 |
402 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) | 406 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) |
403 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 407 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1252 | 1256 |
1253 void RenderThreadImpl::SetFlingCurveParameters( | 1257 void RenderThreadImpl::SetFlingCurveParameters( |
1254 const std::vector<float>& new_touchpad, | 1258 const std::vector<float>& new_touchpad, |
1255 const std::vector<float>& new_touchscreen) { | 1259 const std::vector<float>& new_touchscreen) { |
1256 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1260 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1257 new_touchscreen); | 1261 new_touchscreen); |
1258 | 1262 |
1259 } | 1263 } |
1260 | 1264 |
1261 } // namespace content | 1265 } // namespace content |
OLD | NEW |