| 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 // Only set once per process instance. | 329 // Only set once per process instance. |
| 330 service_factory_.reset(new GpuServiceFactory( | 330 service_factory_.reset(new GpuServiceFactory( |
| 331 gpu_service_->media_gpu_channel_manager()->AsWeakPtr())); | 331 gpu_service_->media_gpu_channel_manager()->AsWeakPtr())); |
| 332 | 332 |
| 333 GetInterfaceRegistry()->AddInterface(base::Bind( | 333 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 334 &GpuChildThread::BindServiceFactoryRequest, base::Unretained(this))); | 334 &GpuChildThread::BindServiceFactoryRequest, base::Unretained(this))); |
| 335 | 335 |
| 336 if (GetContentClient()->gpu()) { // NULL in tests. | 336 if (GetContentClient()->gpu()) { // NULL in tests. |
| 337 GetContentClient()->gpu()->ExposeInterfacesToBrowser(GetInterfaceRegistry(), | 337 GetContentClient()->gpu()->ExposeInterfacesToBrowser(GetInterfaceRegistry(), |
| 338 gpu_preferences); | 338 gpu_preferences); |
| 339 GetContentClient()->gpu()->ConsumeInterfacesFromBrowser( | 339 GetContentClient()->gpu()->ConsumeInterfacesFromBrowser(GetConnector()); |
| 340 GetRemoteInterfaces()); | |
| 341 } | 340 } |
| 342 | 341 |
| 343 GetInterfaceRegistry()->ResumeBinding(); | 342 GetInterfaceRegistry()->ResumeBinding(); |
| 344 } | 343 } |
| 345 | 344 |
| 346 void GpuChildThread::CreateDisplayCompositor( | 345 void GpuChildThread::CreateDisplayCompositor( |
| 347 cc::mojom::DisplayCompositorRequest request, | 346 cc::mojom::DisplayCompositorRequest request, |
| 348 cc::mojom::DisplayCompositorClientPtr client) { | 347 cc::mojom::DisplayCompositorClientPtr client) { |
| 349 NOTREACHED(); | 348 NOTREACHED(); |
| 350 } | 349 } |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 | 419 |
| 421 void GpuChildThread::BindServiceFactoryRequest( | 420 void GpuChildThread::BindServiceFactoryRequest( |
| 422 service_manager::mojom::ServiceFactoryRequest request) { | 421 service_manager::mojom::ServiceFactoryRequest request) { |
| 423 DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest"; | 422 DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest"; |
| 424 DCHECK(service_factory_); | 423 DCHECK(service_factory_); |
| 425 service_factory_bindings_.AddBinding(service_factory_.get(), | 424 service_factory_bindings_.AddBinding(service_factory_.get(), |
| 426 std::move(request)); | 425 std::move(request)); |
| 427 } | 426 } |
| 428 | 427 |
| 429 } // namespace content | 428 } // namespace content |
| OLD | NEW |