Skip to content

Commit c705e70

Browse files
committed
FIXUP: Qt GN integration
Remove guards for WGL. Change-Id: I318781a1661f64a5dbfe5e9ded6546e163d2ac15 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/595117 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
1 parent ac0deea commit c705e70

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

chromium/ui/gl/init/gl_factory_win.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ bool GetGLWindowSystemBindingInfo(const GLVersionInfo& gl_info,
3838
}
3939
}
4040

41-
#if !BUILDFLAG(IS_QTWEBENGINE)
4241
scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
4342
GLSurface* compatible_surface,
4443
const GLContextAttribs& attribs) {
@@ -107,7 +106,6 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurface(GLDisplay* display,
107106
return nullptr;
108107
}
109108
}
110-
#endif // !BUILDFLAG(IS_QTWEBENGINE)
111109

112110
void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
113111
GLImplementation implementation = GetGLImplementation();

chromium/ui/gl/init/gl_initializer_win.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ bool InitializeStaticEGLInternal(GLImplementationParts implementation) {
125125

126126
} // namespace
127127

128-
#if !defined(TOOLKIT_QT)
129128
GLDisplay* InitializeGLOneOffPlatform(gl::GpuPreference gpu_preference) {
130129
VSyncProviderWin::InitializeOneOff();
131130

@@ -149,7 +148,6 @@ GLDisplay* InitializeGLOneOffPlatform(gl::GpuPreference gpu_preference) {
149148
}
150149
return display;
151150
}
152-
#endif
153151

154152
bool InitializeStaticGLBindings(GLImplementationParts implementation) {
155153
// Prevent reinitialization with a different implementation. Once the gpu

0 commit comments

Comments
 (0)