| 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/gpu/gpu_child_thread.h" | 5 #include "content/gpu/gpu_child_thread.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "content/gpu/gpu_service_factory.h" | 22 #include "content/gpu/gpu_service_factory.h" |
| 23 #include "content/public/common/content_client.h" | 23 #include "content/public/common/content_client.h" |
| 24 #include "content/public/common/content_switches.h" | 24 #include "content/public/common/content_switches.h" |
| 25 #include "content/public/common/service_manager_connection.h" | 25 #include "content/public/common/service_manager_connection.h" |
| 26 #include "content/public/gpu/content_gpu_client.h" | 26 #include "content/public/gpu/content_gpu_client.h" |
| 27 #include "gpu/command_buffer/service/gpu_switches.h" | 27 #include "gpu/command_buffer/service/gpu_switches.h" |
| 28 #include "gpu/command_buffer/service/sync_point_manager.h" | 28 #include "gpu/command_buffer/service/sync_point_manager.h" |
| 29 #include "gpu/config/gpu_info_collector.h" | 29 #include "gpu/config/gpu_info_collector.h" |
| 30 #include "gpu/config/gpu_switches.h" | 30 #include "gpu/config/gpu_switches.h" |
| 31 #include "gpu/config/gpu_util.h" | 31 #include "gpu/config/gpu_util.h" |
| 32 #include "gpu/ipc/common/activity_flags.h" |
| 32 #include "gpu/ipc/common/memory_stats.h" | 33 #include "gpu/ipc/common/memory_stats.h" |
| 33 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" | 34 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" |
| 34 #include "gpu/ipc/service/gpu_watchdog_thread.h" | 35 #include "gpu/ipc/service/gpu_watchdog_thread.h" |
| 35 #include "ipc/ipc_channel_handle.h" | 36 #include "ipc/ipc_channel_handle.h" |
| 36 #include "ipc/ipc_sync_message_filter.h" | 37 #include "ipc/ipc_sync_message_filter.h" |
| 37 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" | 38 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" |
| 38 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h" | 39 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h" |
| 39 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h" | 40 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h" |
| 40 #include "media/gpu/ipc/service/media_gpu_channel_manager.h" | 41 #include "media/gpu/ipc/service/media_gpu_channel_manager.h" |
| 41 #include "services/service_manager/public/cpp/interface_registry.h" | 42 #include "services/service_manager/public/cpp/interface_registry.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 mojo::ScopedInterfaceEndpointHandle handle) { | 275 mojo::ScopedInterfaceEndpointHandle handle) { |
| 275 if (associated_interfaces_.CanBindRequest(name)) | 276 if (associated_interfaces_.CanBindRequest(name)) |
| 276 associated_interfaces_.BindRequest(name, std::move(handle)); | 277 associated_interfaces_.BindRequest(name, std::move(handle)); |
| 277 else | 278 else |
| 278 ChildThreadImpl::OnAssociatedInterfaceRequest(name, std::move(handle)); | 279 ChildThreadImpl::OnAssociatedInterfaceRequest(name, std::move(handle)); |
| 279 } | 280 } |
| 280 | 281 |
| 281 void GpuChildThread::CreateGpuService( | 282 void GpuChildThread::CreateGpuService( |
| 282 ui::mojom::GpuServiceRequest request, | 283 ui::mojom::GpuServiceRequest request, |
| 283 ui::mojom::GpuHostPtr gpu_host, | 284 ui::mojom::GpuHostPtr gpu_host, |
| 284 const gpu::GpuPreferences& gpu_preferences) { | 285 const gpu::GpuPreferences& gpu_preferences, |
| 286 mojo::ScopedSharedBufferHandle activity_flags) { |
| 287 gpu::GpuProcessActivityFlags::InitializeInstance(std::move(activity_flags)); |
| 285 gpu_service_->Bind(std::move(request)); | 288 gpu_service_->Bind(std::move(request)); |
| 286 | 289 |
| 287 gpu_info_.video_decode_accelerator_capabilities = | 290 gpu_info_.video_decode_accelerator_capabilities = |
| 288 media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences); | 291 media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences); |
| 289 gpu_info_.video_encode_accelerator_supported_profiles = | 292 gpu_info_.video_encode_accelerator_supported_profiles = |
| 290 media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences); | 293 media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences); |
| 291 gpu_info_.jpeg_decode_accelerator_supported = | 294 gpu_info_.jpeg_decode_accelerator_supported = |
| 292 media::GpuJpegDecodeAcceleratorFactoryProvider:: | 295 media::GpuJpegDecodeAcceleratorFactoryProvider:: |
| 293 IsAcceleratedJpegDecodeSupported(); | 296 IsAcceleratedJpegDecodeSupported(); |
| 294 | 297 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 | 420 |
| 418 void GpuChildThread::BindServiceFactoryRequest( | 421 void GpuChildThread::BindServiceFactoryRequest( |
| 419 service_manager::mojom::ServiceFactoryRequest request) { | 422 service_manager::mojom::ServiceFactoryRequest request) { |
| 420 DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest"; | 423 DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest"; |
| 421 DCHECK(service_factory_); | 424 DCHECK(service_factory_); |
| 422 service_factory_bindings_.AddBinding(service_factory_.get(), | 425 service_factory_bindings_.AddBinding(service_factory_.get(), |
| 423 std::move(request)); | 426 std::move(request)); |
| 424 } | 427 } |
| 425 | 428 |
| 426 } // namespace content | 429 } // namespace content |
| OLD | NEW |