diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-03-22 14:15:27 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-04-03 10:19:45 +0000 |
| commit | 22fec96c83014753f8d4d709dad25902cafa1a75 (patch) | |
| tree | f370d4ba82b9100437b2e76cc213e06fefe736fd | |
| parent | 7642e6138574789186e160699cd1a7917926a296 (diff) | |
| download | qtwebengine-chromium-22fec96c83014753f8d4d709dad25902cafa1a75.tar.gz | |
Fixup: Qt GN integration
Change-Id: I23522acc5128a353a51159308141cac5e3711e50
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468330
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/ui/gl/BUILD.gn | 14 | ||||
| -rw-r--r-- | chromium/ui/gl/gl_display.cc | 4 |
2 files changed, 3 insertions, 15 deletions
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn index 3eab7493096..8da56b479b6 100644 --- a/chromium/ui/gl/BUILD.gn +++ b/chromium/ui/gl/BUILD.gn @@ -472,19 +472,7 @@ jumbo_component("gl") { "//third_party/angle:libGLESv2", ] } - if (is_win) { - sources -= [ - "dc_layer_tree.cc", - "dc_layer_tree.h", - "direct_composition_child_surface_win.cc", - "direct_composition_child_surface_win.h", - "direct_composition_surface_win.cc", - "direct_composition_surface_win.h", - "swap_chain_presenter.cc", - "swap_chain_presenter.h", - ] - } - if (is_linux || is_win) { + if (is_linux) { sources -= [ "gl_surface_egl.cc", "gl_surface_egl.h", diff --git a/chromium/ui/gl/gl_display.cc b/chromium/ui/gl/gl_display.cc index 9f0f0dd15e5..bfc8cbc9b8d 100644 --- a/chromium/ui/gl/gl_display.cc +++ b/chromium/ui/gl/gl_display.cc @@ -764,7 +764,7 @@ void GLDisplayEGL::SetDisplay(EGLDisplay display) { display_ = display; } -#if !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC) +#if !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) EGLDisplayPlatform GLDisplayEGL::GetNativeDisplay() const { return native_display_; } @@ -1031,7 +1031,7 @@ void GLDisplayEGL::InitializeCommon() { #endif // BUILDFLAG(IS_ANDROID) } #endif // defined(USE_EGL) -#endif // !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC) +#endif // !defined(TOOLKIT_QT) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if defined(USE_GLX) GLDisplayX11::GLDisplayX11(uint64_t system_device_id) |