| Index: services/ui/gpu/gpu_service.cc
|
| diff --git a/services/ui/gpu/gpu_service.cc b/services/ui/gpu/gpu_service.cc
|
| index 03c8823b173a4a67a5d29dfcc68e03b1f5a9d8e0..146e54890d444ba693e980fc312e13b02f055098 100644
|
| --- a/services/ui/gpu/gpu_service.cc
|
| +++ b/services/ui/gpu/gpu_service.cc
|
| @@ -93,6 +93,7 @@ GpuService::GpuService(const gpu::GPUInfo& gpu_info,
|
| watchdog_thread_(std::move(watchdog_thread)),
|
| gpu_memory_buffer_factory_(
|
| gpu::GpuMemoryBufferFactory::CreateNativeType()),
|
| + gpu_workarounds_(base::CommandLine::ForCurrentProcess()),
|
| gpu_info_(gpu_info),
|
| gpu_feature_info_(gpu_feature_info),
|
| sync_point_manager_(nullptr),
|
| @@ -132,7 +133,8 @@ void GpuService::UpdateGPUInfoFromPreferences(
|
| DCHECK(!gpu_host_);
|
| gpu_preferences_ = preferences;
|
| gpu_info_.video_decode_accelerator_capabilities =
|
| - media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
|
| + media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_,
|
| + gpu_workarounds_);
|
| gpu_info_.video_encode_accelerator_supported_profiles =
|
| media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences_);
|
| gpu_info_.jpeg_decode_accelerator_supported =
|
| @@ -178,7 +180,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_, gpu_workarounds_, this, watchdog_thread_.get(),
|
| base::ThreadTaskRunnerHandle::Get(), io_runner_, sync_point_manager_,
|
| gpu_memory_buffer_factory_.get(), gpu_feature_info_,
|
| std::move(activity_flags)));
|
|
|