diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-16 18:34:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-04 11:20:50 +0200 |
| commit | fae023b184f6c044e85f4ca6052c306d519e2e85 (patch) | |
| tree | 0c470f156e41fbe5d47782f34a3a8afc17ee3147 /src/core/ozone/gl_surface_qt.cpp | |
| parent | 38a6d268b09c49878b3a9b4819771f5c74925c35 (diff) | |
Adaptations for Chromium 100
Pick-to: 6.4
Change-Id: I217c87657f544a2e868de7291353ff1143e20902
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/ozone/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/ozone/gl_surface_qt.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/core/ozone/gl_surface_qt.cpp b/src/core/ozone/gl_surface_qt.cpp index 1985f50ca..c7c2295f7 100644 --- a/src/core/ozone/gl_surface_qt.cpp +++ b/src/core/ozone/gl_surface_qt.cpp @@ -5,12 +5,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE.Chromium file. -#if !defined(OS_MAC) +#include "qtwebenginecoreglobal_p.h" + +#if !defined(Q_OS_MACOS) #include "gl_surface_qt.h" -#include "qtwebenginecoreglobal_p.h" -#if defined(OS_WIN) +#include "base/logging.h" + +#if BUILDFLAG(IS_WIN) #include "web_engine_context.h" #include "ozone/gl_surface_wgl_qt.h" #include "ozone/gl_surface_egl_qt.h" @@ -83,7 +86,7 @@ void* GLSurfaceQt::GetConfig() return g_config; } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) namespace init { bool InitializeGLOneOffPlatform() { @@ -153,10 +156,10 @@ CreateViewGLSurface(gfx::AcceleratedWidget window) } } // namespace init -#endif // defined(OS_WIN) +#endif // BUILDFLAG(IS_WIN) } // namespace gl -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) namespace gpu { class GpuCommandBufferStub; class GpuChannelManager; @@ -209,5 +212,5 @@ void DirectCompositionSurfaceWin::DisableSoftwareOverlays() { } } // namespace gl -#endif -#endif // !defined(OS_MAC) +#endif // BUILDFLAG(IS_WIN) +#endif // !defined(Q_OS_MACOS) |