| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 69 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
| 70 #include "content/renderer/gamepad_shared_memory_reader.h" | 70 #include "content/renderer/gamepad_shared_memory_reader.h" |
| 71 #include "content/renderer/gpu/compositor_output_surface.h" | 71 #include "content/renderer/gpu/compositor_output_surface.h" |
| 72 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 72 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
| 73 #include "content/renderer/input/input_event_filter.h" | 73 #include "content/renderer/input/input_event_filter.h" |
| 74 #include "content/renderer/input/input_handler_manager.h" | 74 #include "content/renderer/input/input_handler_manager.h" |
| 75 #include "content/renderer/media/audio_input_message_filter.h" | 75 #include "content/renderer/media/audio_input_message_filter.h" |
| 76 #include "content/renderer/media/audio_message_filter.h" | 76 #include "content/renderer/media/audio_message_filter.h" |
| 77 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 77 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| 78 #include "content/renderer/media/media_stream_center.h" | 78 #include "content/renderer/media/media_stream_center.h" |
| 79 #include "content/renderer/media/media_stream_dependency_factory.h" | |
| 80 #include "content/renderer/media/midi_message_filter.h" | 79 #include "content/renderer/media/midi_message_filter.h" |
| 81 #include "content/renderer/media/peer_connection_tracker.h" | 80 #include "content/renderer/media/peer_connection_tracker.h" |
| 82 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" | 81 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" |
| 83 #include "content/renderer/media/video_capture_impl_manager.h" | 82 #include "content/renderer/media/video_capture_impl_manager.h" |
| 84 #include "content/renderer/media/video_capture_message_filter.h" | 83 #include "content/renderer/media/video_capture_message_filter.h" |
| 84 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" |
| 85 #include "content/renderer/media/webrtc_identity_service.h" | 85 #include "content/renderer/media/webrtc_identity_service.h" |
| 86 #include "content/renderer/p2p/socket_dispatcher.h" | 86 #include "content/renderer/p2p/socket_dispatcher.h" |
| 87 #include "content/renderer/render_process_impl.h" | 87 #include "content/renderer/render_process_impl.h" |
| 88 #include "content/renderer/render_view_impl.h" | 88 #include "content/renderer/render_view_impl.h" |
| 89 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 89 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 90 #include "content/renderer/service_worker/embedded_worker_context_message_filter
.h" | 90 #include "content/renderer/service_worker/embedded_worker_context_message_filter
.h" |
| 91 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 91 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
| 92 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" | 92 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h" |
| 93 #include "content/renderer/web_ui_setup_impl.h" | 93 #include "content/renderer/web_ui_setup_impl.h" |
| 94 #include "grit/content_resources.h" | 94 #include "grit/content_resources.h" |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 #if defined(ENABLE_WEBRTC) | 370 #if defined(ENABLE_WEBRTC) |
| 371 peer_connection_tracker_.reset(new PeerConnectionTracker()); | 371 peer_connection_tracker_.reset(new PeerConnectionTracker()); |
| 372 AddObserver(peer_connection_tracker_.get()); | 372 AddObserver(peer_connection_tracker_.get()); |
| 373 | 373 |
| 374 p2p_socket_dispatcher_ = | 374 p2p_socket_dispatcher_ = |
| 375 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); | 375 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); |
| 376 AddFilter(p2p_socket_dispatcher_.get()); | 376 AddFilter(p2p_socket_dispatcher_.get()); |
| 377 | 377 |
| 378 webrtc_identity_service_.reset(new WebRTCIdentityService()); | 378 webrtc_identity_service_.reset(new WebRTCIdentityService()); |
| 379 | 379 |
| 380 media_stream_factory_.reset(new MediaStreamDependencyFactory( | 380 media_stream_factory_.reset(new PeerConnectionDependencyFactory( |
| 381 p2p_socket_dispatcher_.get())); | 381 p2p_socket_dispatcher_.get())); |
| 382 AddObserver(media_stream_factory_.get()); | 382 AddObserver(media_stream_factory_.get()); |
| 383 #endif // defined(ENABLE_WEBRTC) | 383 #endif // defined(ENABLE_WEBRTC) |
| 384 | 384 |
| 385 audio_input_message_filter_ = | 385 audio_input_message_filter_ = |
| 386 new AudioInputMessageFilter(GetIOMessageLoopProxy()); | 386 new AudioInputMessageFilter(GetIOMessageLoopProxy()); |
| 387 AddFilter(audio_input_message_filter_.get()); | 387 AddFilter(audio_input_message_filter_.get()); |
| 388 | 388 |
| 389 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); | 389 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); |
| 390 AddFilter(audio_message_filter_.get()); | 390 AddFilter(audio_message_filter_.get()); |
| (...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1307 switches::kDisableWebRTC)) | 1307 switches::kDisableWebRTC)) |
| 1308 return NULL; | 1308 return NULL; |
| 1309 #endif | 1309 #endif |
| 1310 | 1310 |
| 1311 #if defined(ENABLE_WEBRTC) | 1311 #if defined(ENABLE_WEBRTC) |
| 1312 if (!media_stream_center_) { | 1312 if (!media_stream_center_) { |
| 1313 media_stream_center_ = GetContentClient()->renderer() | 1313 media_stream_center_ = GetContentClient()->renderer() |
| 1314 ->OverrideCreateWebMediaStreamCenter(client); | 1314 ->OverrideCreateWebMediaStreamCenter(client); |
| 1315 if (!media_stream_center_) { | 1315 if (!media_stream_center_) { |
| 1316 scoped_ptr<MediaStreamCenter> media_stream_center( | 1316 scoped_ptr<MediaStreamCenter> media_stream_center( |
| 1317 new MediaStreamCenter(client, GetMediaStreamDependencyFactory())); | 1317 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory())); |
| 1318 AddObserver(media_stream_center.get()); | 1318 AddObserver(media_stream_center.get()); |
| 1319 media_stream_center_ = media_stream_center.release(); | 1319 media_stream_center_ = media_stream_center.release(); |
| 1320 } | 1320 } |
| 1321 } | 1321 } |
| 1322 #endif | 1322 #endif |
| 1323 return media_stream_center_; | 1323 return media_stream_center_; |
| 1324 } | 1324 } |
| 1325 | 1325 |
| 1326 MediaStreamDependencyFactory* | 1326 PeerConnectionDependencyFactory* |
| 1327 RenderThreadImpl::GetMediaStreamDependencyFactory() { | 1327 RenderThreadImpl::GetPeerConnectionDependencyFactory() { |
| 1328 return media_stream_factory_.get(); | 1328 return media_stream_factory_.get(); |
| 1329 } | 1329 } |
| 1330 | 1330 |
| 1331 GpuChannelHost* RenderThreadImpl::GetGpuChannel() { | 1331 GpuChannelHost* RenderThreadImpl::GetGpuChannel() { |
| 1332 if (!gpu_channel_.get()) | 1332 if (!gpu_channel_.get()) |
| 1333 return NULL; | 1333 return NULL; |
| 1334 | 1334 |
| 1335 if (gpu_channel_->IsLost()) | 1335 if (gpu_channel_->IsLost()) |
| 1336 return NULL; | 1336 return NULL; |
| 1337 | 1337 |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1502 hidden_widget_count_--; | 1502 hidden_widget_count_--; |
| 1503 | 1503 |
| 1504 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1504 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
| 1505 return; | 1505 return; |
| 1506 } | 1506 } |
| 1507 | 1507 |
| 1508 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1508 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
| 1509 } | 1509 } |
| 1510 | 1510 |
| 1511 } // namespace content | 1511 } // namespace content |
| OLD | NEW |