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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/memory_benchmarking_extension.h" | 67 #include "content/renderer/memory_benchmarking_extension.h" |
68 #include "content/renderer/p2p/socket_dispatcher.h" | 68 #include "content/renderer/p2p/socket_dispatcher.h" |
69 #include "content/renderer/plugin_channel_host.h" | 69 #include "content/renderer/plugin_channel_host.h" |
70 #include "content/renderer/render_process_impl.h" | 70 #include "content/renderer/render_process_impl.h" |
71 #include "content/renderer/render_view_impl.h" | 71 #include "content/renderer/render_view_impl.h" |
72 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 72 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 73 #include "content/renderer/webrtc_logging_message_filter.h" |
73 #include "grit/content_resources.h" | 74 #include "grit/content_resources.h" |
74 #include "ipc/ipc_channel_handle.h" | 75 #include "ipc/ipc_channel_handle.h" |
75 #include "ipc/ipc_forwarding_message_filter.h" | 76 #include "ipc/ipc_forwarding_message_filter.h" |
76 #include "ipc/ipc_platform_file.h" | 77 #include "ipc/ipc_platform_file.h" |
77 #include "media/base/audio_hardware_config.h" | 78 #include "media/base/audio_hardware_config.h" |
78 #include "media/base/media.h" | 79 #include "media/base/media.h" |
79 #include "media/base/media_switches.h" | 80 #include "media/base/media_switches.h" |
80 #include "net/base/net_errors.h" | 81 #include "net/base/net_errors.h" |
81 #include "net/base/net_util.h" | 82 #include "net/base/net_util.h" |
82 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 83 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 | 378 |
378 audio_input_message_filter_ = | 379 audio_input_message_filter_ = |
379 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 380 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
380 AddFilter(audio_input_message_filter_.get()); | 381 AddFilter(audio_input_message_filter_.get()); |
381 | 382 |
382 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 383 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
383 AddFilter(audio_message_filter_.get()); | 384 AddFilter(audio_message_filter_.get()); |
384 | 385 |
385 AddFilter(new IndexedDBMessageFilter); | 386 AddFilter(new IndexedDBMessageFilter); |
386 | 387 |
| 388 #if defined(ENABLE_WEBRTC) |
| 389 webrtc_logging_message_filter_ = |
| 390 new WebRtcLoggingMessageFilter(GetIOMessageLoopProxy()); |
| 391 AddFilter(webrtc_logging_message_filter_.get()); |
| 392 #endif |
| 393 |
387 GetContentClient()->renderer()->RenderThreadStarted(); | 394 GetContentClient()->renderer()->RenderThreadStarted(); |
388 | 395 |
389 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 396 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
390 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) | 397 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) |
391 RegisterExtension(GpuBenchmarkingExtension::Get()); | 398 RegisterExtension(GpuBenchmarkingExtension::Get()); |
392 | 399 |
393 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 400 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
394 RegisterExtension(MemoryBenchmarkingExtension::Get()); | 401 RegisterExtension(MemoryBenchmarkingExtension::Get()); |
395 | 402 |
396 context_lost_cb_.reset(new GpuVDAContextLostCallback()); | 403 context_lost_cb_.reset(new GpuVDAContextLostCallback()); |
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1292 | 1299 |
1293 void RenderThreadImpl::SetFlingCurveParameters( | 1300 void RenderThreadImpl::SetFlingCurveParameters( |
1294 const std::vector<float>& new_touchpad, | 1301 const std::vector<float>& new_touchpad, |
1295 const std::vector<float>& new_touchscreen) { | 1302 const std::vector<float>& new_touchscreen) { |
1296 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1303 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1297 new_touchscreen); | 1304 new_touchscreen); |
1298 | 1305 |
1299 } | 1306 } |
1300 | 1307 |
1301 } // namespace content | 1308 } // namespace content |
OLD | NEW |