| Index: services/ui/gpu/gpu_service.cc
|
| diff --git a/services/ui/gpu/gpu_service.cc b/services/ui/gpu/gpu_service.cc
|
| index e217a6d3b81b875ad0659c9baa653e71c7392301..115264675ae51f37fa4d18cffa76467bc286ca0f 100644
|
| --- a/services/ui/gpu/gpu_service.cc
|
| +++ b/services/ui/gpu/gpu_service.cc
|
| @@ -62,16 +62,19 @@ GpuService::~GpuService() {
|
| shutdown_event_.Signal();
|
| }
|
|
|
| -void GpuService::InitializeWithHost(mojom::GpuHostPtr gpu_host,
|
| - const gpu::GpuPreferences& preferences,
|
| - gpu::SyncPointManager* sync_point_manager,
|
| - base::WaitableEvent* shutdown_event) {
|
| +void GpuService::InitializeWithHost(
|
| + mojom::GpuHostPtr gpu_host,
|
| + const gpu::GpuPreferences& preferences,
|
| + const gpu::GpuDriverBugWorkarounds& workarounds,
|
| + gpu::SyncPointManager* sync_point_manager,
|
| + base::WaitableEvent* shutdown_event) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(!gpu_host_);
|
| gpu_host_ = std::move(gpu_host);
|
| gpu_preferences_ = preferences;
|
| gpu_info_.video_decode_accelerator_capabilities =
|
| - media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
|
| + media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_,
|
| + workarounds);
|
| gpu_info_.video_encode_accelerator_supported_profiles =
|
| media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences_);
|
| gpu_info_.jpeg_decode_accelerator_supported =
|
| @@ -90,7 +93,7 @@ void GpuService::InitializeWithHost(mojom::GpuHostPtr gpu_host,
|
| // IPC messages before the sandbox has been enabled and all other necessary
|
| // initialization has succeeded.
|
| gpu_channel_manager_.reset(new gpu::GpuChannelManager(
|
| - gpu_preferences_, this, watchdog_thread_.get(),
|
| + gpu_preferences_, workarounds, this, watchdog_thread_.get(),
|
| base::ThreadTaskRunnerHandle::Get().get(), io_runner_.get(),
|
| shutdown_event ? shutdown_event : &shutdown_event_, sync_point_manager_,
|
| gpu_memory_buffer_factory_));
|
|
|