diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc index 2c87dab4cb7c30..b35e61e510c435 100644 --- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc +++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc @@ -2087,14 +2087,12 @@ bool SkiaOutputSurfaceImplOnGpu::InitializeForDawn() { GetDidSwapBuffersCompleteCallback()); AddChildWindowToBrowser(output_device->GetChildSurfaceHandle()); output_device_ = std::move(output_device); -#elif BUILDFLAG(IS_APPLE) +#elif BUILDFLAG(IS_MAC) presenter_ = dependency_->CreatePresenter(weak_ptr_factory_.GetWeakPtr(), gl::GLSurfaceFormat()); -#if BUILDFLAG(IS_MAC) if (features::UseGpuVsync()) { presenter_->SetVSyncDisplayID(renderer_settings_.display_id); } -#endif output_device_ = std::make_unique( std::make_unique( presenter_, dependency_, shared_image_factory_.get(), diff --git a/gpu/command_buffer/service/dawn_context_provider.cc b/gpu/command_buffer/service/dawn_context_provider.cc index b51f23c4b98082..8fd1ea39bcf8bb 100644 --- a/gpu/command_buffer/service/dawn_context_provider.cc +++ b/gpu/command_buffer/service/dawn_context_provider.cc @@ -52,7 +52,7 @@ wgpu::BackendType GetDefaultBackendType() { : wgpu::BackendType::D3D11; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) return wgpu::BackendType::Vulkan; -#elif BUILDFLAG(IS_APPLE) +#elif BUILDFLAG(IS_MAC) return wgpu::BackendType::Metal; #else NOTREACHED(); diff --git a/ui/gl/features.gni b/ui/gl/features.gni index 83266614af09fa..fbc49c2ebecef4 100644 --- a/ui/gl/features.gni +++ b/ui/gl/features.gni @@ -18,8 +18,8 @@ declare_args() { # Should Dawn support be compiled to back the WebGPU implementation? # Also controls linking Dawn dependencies in such as SPIRV-Tools/SPIRV-Cross. - use_dawn = is_apple || is_win || is_chromeos_ash || - (is_linux && !is_castos) || is_chromeos_lacros || + use_dawn = is_mac || is_win || is_chromeos_ash || (is_linux && !is_castos) || + is_chromeos_lacros || (is_android && target_cpu != "x86" && target_cpu != "x64") # Should Dawn test binaries (unittests, end2end_tests, perf_tests) be built?