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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 #include "content/renderer/devtools/devtools_agent_filter.h" | 53 #include "content/renderer/devtools/devtools_agent_filter.h" |
54 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" | 54 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" |
55 #include "content/renderer/dom_storage/webstoragearea_impl.h" | 55 #include "content/renderer/dom_storage/webstoragearea_impl.h" |
56 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 56 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
57 #include "content/renderer/gpu/compositor_output_surface.h" | 57 #include "content/renderer/gpu/compositor_output_surface.h" |
58 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 58 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
59 #include "content/renderer/gpu/input_handler_manager.h" | 59 #include "content/renderer/gpu/input_handler_manager.h" |
60 #include "content/renderer/gpu/input_event_filter.h" | 60 #include "content/renderer/gpu/input_event_filter.h" |
61 #include "content/renderer/media/audio_input_message_filter.h" | 61 #include "content/renderer/media/audio_input_message_filter.h" |
62 #include "content/renderer/media/audio_message_filter.h" | 62 #include "content/renderer/media/audio_message_filter.h" |
63 | |
scherkus (not reviewing)
2013/06/12 01:28:47
remove blanks here
Chris Rogers
2013/06/12 20:34:35
Done.
| |
64 #include "content/renderer/media/midi_message_filter.h" | |
65 | |
63 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 66 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
64 #include "content/renderer/media/media_stream_center.h" | 67 #include "content/renderer/media/media_stream_center.h" |
65 #include "content/renderer/media/media_stream_dependency_factory.h" | 68 #include "content/renderer/media/media_stream_dependency_factory.h" |
66 #include "content/renderer/media/peer_connection_tracker.h" | 69 #include "content/renderer/media/peer_connection_tracker.h" |
67 #include "content/renderer/media/video_capture_impl_manager.h" | 70 #include "content/renderer/media/video_capture_impl_manager.h" |
68 #include "content/renderer/media/video_capture_message_filter.h" | 71 #include "content/renderer/media/video_capture_message_filter.h" |
69 #include "content/renderer/memory_benchmarking_extension.h" | 72 #include "content/renderer/memory_benchmarking_extension.h" |
70 #include "content/renderer/p2p/socket_dispatcher.h" | 73 #include "content/renderer/p2p/socket_dispatcher.h" |
71 #include "content/renderer/plugin_channel_host.h" | 74 #include "content/renderer/plugin_channel_host.h" |
72 #include "content/renderer/render_process_impl.h" | 75 #include "content/renderer/render_process_impl.h" |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 vc_manager_ = new VideoCaptureImplManager(); | 385 vc_manager_ = new VideoCaptureImplManager(); |
383 AddFilter(vc_manager_->video_capture_message_filter()); | 386 AddFilter(vc_manager_->video_capture_message_filter()); |
384 | 387 |
385 audio_input_message_filter_ = | 388 audio_input_message_filter_ = |
386 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 389 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
387 AddFilter(audio_input_message_filter_.get()); | 390 AddFilter(audio_input_message_filter_.get()); |
388 | 391 |
389 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 392 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
390 AddFilter(audio_message_filter_.get()); | 393 AddFilter(audio_message_filter_.get()); |
391 | 394 |
395 midi_message_filter_ = new MIDIMessageFilter(GetIOMessageLoopProxy()); | |
396 AddFilter(midi_message_filter_.get()); | |
397 | |
398 | |
scherkus (not reviewing)
2013/06/12 01:28:47
remove extra blanks
Chris Rogers
2013/06/12 20:34:35
Done.
| |
399 | |
392 AddFilter(new IndexedDBMessageFilter); | 400 AddFilter(new IndexedDBMessageFilter); |
393 | 401 |
394 GetContentClient()->renderer()->RenderThreadStarted(); | 402 GetContentClient()->renderer()->RenderThreadStarted(); |
395 | 403 |
396 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 404 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
397 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 405 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
398 RegisterExtension(GpuBenchmarkingExtension::Get()); | 406 RegisterExtension(GpuBenchmarkingExtension::Get()); |
399 | 407 |
400 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) | 408 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) |
401 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 409 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1378 | 1386 |
1379 void RenderThreadImpl::SetFlingCurveParameters( | 1387 void RenderThreadImpl::SetFlingCurveParameters( |
1380 const std::vector<float>& new_touchpad, | 1388 const std::vector<float>& new_touchpad, |
1381 const std::vector<float>& new_touchscreen) { | 1389 const std::vector<float>& new_touchscreen) { |
1382 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1390 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1383 new_touchscreen); | 1391 new_touchscreen); |
1384 | 1392 |
1385 } | 1393 } |
1386 | 1394 |
1387 } // namespace content | 1395 } // namespace content |
OLD | NEW |