diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 1bf094a0ad68dd4ae0bd2e3dca611d26c5d92108..8f6687ff32989587770aff0eb06feebe6648eb4e 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -74,10 +74,6 @@ #include "net/ssl/openssl_client_key_store.h" #endif -#if defined(OS_WIN) -#include "gpu/ipc/service/direct_composition_surface_win.h" -#endif - namespace QtWebEngineCore { void GetScreenInfoFromNativeWindow(QWindow* window, content::ScreenInfo* results) { @@ -201,11 +197,6 @@ ui::OSExchangeDataProviderFactory::CreateProvider() { return nullptr; } -#if defined(OS_WIN) -bool gpu::DirectCompositionSurfaceWin::IsHDRSupported() -{ return false; } -#endif - #if defined(USE_OPENSSL_CERTS) namespace net { diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index b41ce1d29cd59418ee18ef96652e2262243af6d9..abe0ed5d32df7c3a56c87798dfaf2ff8808889b3 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -61,6 +61,8 @@ #if defined(OS_WIN) #include "ozone/gl_surface_wgl_qt.h" + +#include "gpu/ipc/service/direct_composition_surface_win.h" #include "ui/gl/gl_context_wgl.h" #include "ui/gl/vsync_provider_win.h" #endif @@ -235,6 +237,12 @@ scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(base::We QT_NOT_USED return scoped_refptr<gl::GLSurface>(); } -} + +#if defined(OS_WIN) +bool DirectCompositionSurfaceWin::IsHDRSupported() +{ return false; } +#endif + +} // namespace gpu #endif // !defined(OS_MACOSX)