| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index 4d8a952ff3dc7bc0d7ec80c3f06e46d2dfbf5dd9..33b95ffa6a6036bd1ccac49c3f9f4a066667f026 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -24,6 +24,7 @@
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/service_manager_connection.h"
|
| #include "content/public/gpu/content_gpu_client.h"
|
| +#include "gpu/command_buffer/common/activity_flags.h"
|
| #include "gpu/command_buffer/service/gpu_switches.h"
|
| #include "gpu/command_buffer/service/sync_point_manager.h"
|
| #include "gpu/config/gpu_info_collector.h"
|
| @@ -282,7 +283,8 @@ void GpuChildThread::OnAssociatedInterfaceRequest(
|
| void GpuChildThread::CreateGpuService(
|
| ui::mojom::GpuServiceRequest request,
|
| ui::mojom::GpuHostPtr gpu_host,
|
| - const gpu::GpuPreferences& gpu_preferences) {
|
| + const gpu::GpuPreferences& gpu_preferences,
|
| + mojo::ScopedSharedBufferHandle activity_flags) {
|
| gpu_service_->Bind(std::move(request));
|
|
|
| gpu_info_.video_decode_accelerator_capabilities =
|
| @@ -319,9 +321,10 @@ void GpuChildThread::CreateGpuService(
|
| // Note SyncPointManager from ContentGpuClient cannot be owned by this.
|
| if (GetContentClient()->gpu())
|
| sync_point_manager = GetContentClient()->gpu()->GetSyncPointManager();
|
| - gpu_service_->InitializeWithHost(std::move(gpu_host), gpu_preferences,
|
| - sync_point_manager,
|
| - ChildProcess::current()->GetShutDownEvent());
|
| + gpu_service_->InitializeWithHost(
|
| + std::move(gpu_host), gpu_preferences,
|
| + gpu::GpuProcessActivityFlags(std::move(activity_flags)),
|
| + sync_point_manager, ChildProcess::current()->GetShutDownEvent());
|
| CHECK(gpu_service_->media_gpu_channel_manager());
|
|
|
| // Only set once per process instance.
|
|
|