Title: [289807] releases/WebKitGTK/webkit-2.34/Source
- Revision
- 289807
- Author
- [email protected]
- Date
- 2022-02-15 06:23:17 -0800 (Tue, 15 Feb 2022)
Log Message
Merge r289795 - [GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
https://bugs.webkit.org/show_bug.cgi?id=236593
Reviewed by Michael Catanzaro.
Source/WebCore:
No new tests needed.
* platform/graphics/GLContext.cpp: Remove inclusion of OpenGLShims.h guarded by USE(GLX).
* platform/graphics/GLContext.h: Include OpenGLShims.h as fallback option when neither
USE(LIBEPOXY) nor USE(OPENGL_ES) are into effect.
Source/WebKit:
* UIProcess/API/glib/WebKitProtocolHandler.cpp: Move inclusion of GL/glx.h under a
PLATFORM(X11) guard, and inclusion of WebCore/OpenGLShims.h into a chain of guards
which picks it if USE(LIBEPOXY) and USE(OPENGL_ES) are both false, which is the same
checks done in other parts of the code where these are needed.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog (289806 => 289807)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog 2022-02-15 14:22:24 UTC (rev 289806)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog 2022-02-15 14:23:17 UTC (rev 289807)
@@ -1,3 +1,16 @@
+2022-02-15 Adrian Perez de Castro <[email protected]>
+
+ [GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
+ https://bugs.webkit.org/show_bug.cgi?id=236593
+
+ Reviewed by Michael Catanzaro.
+
+ No new tests needed.
+
+ * platform/graphics/GLContext.cpp: Remove inclusion of OpenGLShims.h guarded by USE(GLX).
+ * platform/graphics/GLContext.h: Include OpenGLShims.h as fallback option when neither
+ USE(LIBEPOXY) nor USE(OPENGL_ES) are into effect.
+
2022-01-24 Yusuke Suzuki <[email protected]>
Expand RefPtr / Ref use in FrameLoader
Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/GLContext.cpp (289806 => 289807)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/GLContext.cpp 2022-02-15 14:22:24 UTC (rev 289806)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/GLContext.cpp 2022-02-15 14:23:17 UTC (rev 289807)
@@ -31,7 +31,6 @@
#if USE(GLX)
#include "GLContextGLX.h"
-#include "OpenGLShims.h"
#endif
using WTF::ThreadSpecific;
Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/GLContext.h (289806 => 289807)
--- releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/GLContext.h 2022-02-15 14:22:24 UTC (rev 289806)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/GLContext.h 2022-02-15 14:23:17 UTC (rev 289807)
@@ -28,6 +28,8 @@
#include <epoxy/gl.h>
#elif USE(OPENGL_ES)
#include <GLES2/gl2.h>
+#else
+#include "OpenGLShims.h"
#endif
#if USE(EGL) && !PLATFORM(GTK)
Modified: releases/WebKitGTK/webkit-2.34/Source/WebKit/ChangeLog (289806 => 289807)
--- releases/WebKitGTK/webkit-2.34/Source/WebKit/ChangeLog 2022-02-15 14:22:24 UTC (rev 289806)
+++ releases/WebKitGTK/webkit-2.34/Source/WebKit/ChangeLog 2022-02-15 14:23:17 UTC (rev 289807)
@@ -1,3 +1,15 @@
+2022-02-15 Adrian Perez de Castro <[email protected]>
+
+ [GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
+ https://bugs.webkit.org/show_bug.cgi?id=236593
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/API/glib/WebKitProtocolHandler.cpp: Move inclusion of GL/glx.h under a
+ PLATFORM(X11) guard, and inclusion of WebCore/OpenGLShims.h into a chain of guards
+ which picks it if USE(LIBEPOXY) and USE(OPENGL_ES) are both false, which is the same
+ checks done in other parts of the code where these are needed.
+
2022-02-11 Carlos Garcia Campos <[email protected]>
[WPE][GTK] BubblewrapLauncher leaks D-Bus proxy sockets
Modified: releases/WebKitGTK/webkit-2.34/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp (289806 => 289807)
--- releases/WebKitGTK/webkit-2.34/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2022-02-15 14:22:24 UTC (rev 289806)
+++ releases/WebKitGTK/webkit-2.34/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2022-02-15 14:23:17 UTC (rev 289807)
@@ -53,10 +53,17 @@
#if PLATFORM(X11)
#include <WebCore/PlatformDisplayX11.h>
+#if USE(GLX)
+#include <GL/glx.h>
#endif
+#endif
#if USE(LIBEPOXY)
#include <epoxy/gl.h>
+#elif USE(OPENGL_ES)
+#include <GLES2/gl2.h>
+#else
+#include <WebCore/OpenGLShims.h>
#endif
#if USE(EGL)
@@ -67,11 +74,6 @@
#endif
#endif
-#if USE(GLX)
-#include <GL/glx.h>
-#include <WebCore/OpenGLShims.h>
-#endif
-
#if USE(GSTREAMER)
#include <gst/gst.h>
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
