From a5a6050ed551972faaaa65ebc2b4e7e1958738a1 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann Date: Fri, 6 Nov 2020 16:17:30 +0000 Subject: [PATCH] fix building without Ozone When building with use_x11=true and use_ozone=false build fails, because features::IsUsingOzonePlatform() is not defined: ../../content/browser/gpu/gpu_internals_ui.cc: In function 'std::unique_ptr content::{anonymous}::GpuMemoryBufferInfo(const gfx::GpuExtraInfo&)' ../../content/browser/gpu/gpu_internals_ui.cc:397:18: error: 'IsUsingOzonePlatform' is not a member of 'features' 397 | if (!features::IsUsingOzonePlatform()) { | ^~~~~~~~~~~~~~~~~~~~ --- content/browser/gpu/gpu_internals_ui.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index 4f07186..01dfcbf 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -394,7 +394,12 @@ std::unique_ptr GpuMemoryBufferInfo( gpu::GpuMemoryBufferConfigurationSet native_config; #if defined(USE_X11) - if (!features::IsUsingOzonePlatform()) { +#if defined(USE_OZONE) + const auto is_using_ozone_platform = features::IsUsingOzonePlatform(); +#else + const auto is_using_ozone_platform = false; +#endif + if (!is_using_ozone_platform) { for (const auto& config : gpu_extra_info.gpu_memory_buffer_support_x11) { native_config.emplace(config); } -- 2.26.2