From d7f3899aa3f29ff26932e2258c349317d42f2d78 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 6 Apr 2018 14:03:04 +0200
Subject: [PATCH] Fix Windows ANGLE builds
Move implementation of DirectCompositionSurfaceWin::IsHDRSupported() so
OpenGL definitions doesn't conflict.
Change-Id: Ib5d61b647b9a6ca00e8f9dae2dffb8cb72fa09c0
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/chromium_overrides.cpp | 9 ---------
src/core/gl_surface_qt.cpp | 10 +++++++++-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index 1bf094a0a..8f6687ff3 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 b41ce1d29..abe0ed5d3 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)
--
GitLab