| 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 gpu_service_->InitializeWithHost( | 276 gpu_service_->InitializeWithHost( |
| 277 std::move(gpu_host), | 277 std::move(gpu_host), |
| 278 gpu::GpuProcessActivityFlags(std::move(activity_flags)), | 278 gpu::GpuProcessActivityFlags(std::move(activity_flags)), |
| 279 sync_point_manager, ChildProcess::current()->GetShutDownEvent()); | 279 sync_point_manager, ChildProcess::current()->GetShutDownEvent()); |
| 280 CHECK(gpu_service_->media_gpu_channel_manager()); | 280 CHECK(gpu_service_->media_gpu_channel_manager()); |
| 281 | 281 |
| 282 // Only set once per process instance. | 282 // Only set once per process instance. |
| 283 service_factory_.reset(new GpuServiceFactory( | 283 service_factory_.reset(new GpuServiceFactory( |
| 284 gpu_service_->media_gpu_channel_manager()->AsWeakPtr())); | 284 gpu_service_->media_gpu_channel_manager()->AsWeakPtr())); |
| 285 | 285 |
| 286 #if defined(OS_ANDROID) |
| 287 gpu_service_->media_gpu_channel_manager()->SetMojoConnector( |
| 288 ChildThread::Get()->GetConnector(), content::mojom::kBrowserServiceName); |
| 289 #endif |
| 290 |
| 286 if (GetContentClient()->gpu()) // NULL in tests. | 291 if (GetContentClient()->gpu()) // NULL in tests. |
| 287 GetContentClient()->gpu()->GpuServiceInitialized(gpu_preferences); | 292 GetContentClient()->gpu()->GpuServiceInitialized(gpu_preferences); |
| 288 | 293 |
| 289 release_pending_requests_closure_.Run(); | 294 release_pending_requests_closure_.Run(); |
| 290 } | 295 } |
| 291 | 296 |
| 292 void GpuChildThread::CreateFrameSinkManager( | 297 void GpuChildThread::CreateFrameSinkManager( |
| 293 cc::mojom::FrameSinkManagerRequest request, | 298 cc::mojom::FrameSinkManagerRequest request, |
| 294 cc::mojom::FrameSinkManagerClientPtr client) { | 299 cc::mojom::FrameSinkManagerClientPtr client) { |
| 295 NOTREACHED(); | 300 NOTREACHED(); |
| 296 } | 301 } |
| 297 | 302 |
| 298 void GpuChildThread::BindServiceFactoryRequest( | 303 void GpuChildThread::BindServiceFactoryRequest( |
| 299 const service_manager::BindSourceInfo& source_info, | 304 const service_manager::BindSourceInfo& source_info, |
| 300 service_manager::mojom::ServiceFactoryRequest request) { | 305 service_manager::mojom::ServiceFactoryRequest request) { |
| 301 DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest"; | 306 DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest"; |
| 302 DCHECK(service_factory_); | 307 DCHECK(service_factory_); |
| 303 service_factory_bindings_.AddBinding(service_factory_.get(), | 308 service_factory_bindings_.AddBinding(service_factory_.get(), |
| 304 std::move(request)); | 309 std::move(request)); |
| 305 } | 310 } |
| 306 | 311 |
| 307 } // namespace content | 312 } // namespace content |
| OLD | NEW |