| Index: content/browser/compositor/gpu_process_transport_factory.cc
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
|
| index 2d6a2d6bac0914b55091cc7be27045f39e3474b1..0b79d1480939960907eb75e3a2e704694efb7b13 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -48,7 +48,6 @@
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| #include "gpu/ipc/client/gpu_channel_host.h"
|
| #include "gpu/ipc/host/gpu_memory_buffer_support.h"
|
| -#include "gpu/vulkan/features.h"
|
| #include "services/service_manager/runner/common/client_util.h"
|
| #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| @@ -96,7 +95,7 @@
|
| #include "gpu/ipc/common/gpu_surface_tracker.h"
|
| #endif
|
|
|
| -#if BUILDFLAG(ENABLE_VULKAN)
|
| +#if defined(ENABLE_VULKAN)
|
| #include "content/browser/compositor/vulkan_browser_compositor_output_surface.h"
|
| #endif
|
|
|
| @@ -487,7 +486,7 @@
|
| GpuVSyncControl* gpu_vsync_control = nullptr;
|
|
|
| std::unique_ptr<BrowserCompositorOutputSurface> display_output_surface;
|
| -#if BUILDFLAG(ENABLE_VULKAN)
|
| +#if defined(ENABLE_VULKAN)
|
| std::unique_ptr<VulkanBrowserCompositorOutputSurface> vulkan_surface;
|
| if (vulkan_context_provider) {
|
| vulkan_surface.reset(new VulkanBrowserCompositorOutputSurface(
|
|
|