Attachment 451941 Details for Bug 236593 – Patch

[patch] Patch

bug-236593-20220214235652.patch (text/plain), 3.45 KB, created by Adrian Perez on 2022-02-14 13:56:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2022-02-14 13:56:53 PST

Size: 3.45 KB

patch

obsolete

>Subversion Revision: 289730
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c506432ec4fe87f9012e0be706079a26a85ab21e..7fab0d1112c64c06e1a71701dac9f5efc986f050 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2022-02-14  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
>+        https://bugs.webkit.org/show_bug.cgi?id=236593
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-02-14  Enrique OcaÃ±a GonzÃ¡lez  <eocanha@igalia.com>
> 
>         Don't throw exception when controls are removed
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 356d76189b4e8e7a8b196d73bc16ff94e9f0a233..12586b7a25045f874644b4fb254ecccebf8e3551 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2022-02-14  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX)
>+        https://bugs.webkit.org/show_bug.cgi?id=236593
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-13  Lauro Moura  <lmoura@igalia.com>
> 
>         Unreviewed, non-unified build fixes
>diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
>index 0cc2d4e8f1c6ec58f8b256986d00ccf996c47117..17892611e2f49db0caa7032badf6080c41ac02dd 100644
>--- a/Source/WebCore/platform/graphics/GLContext.cpp
>+++ b/Source/WebCore/platform/graphics/GLContext.cpp
>@@ -31,7 +31,6 @@
> 
> #if USE(GLX)
> #include "GLContextGLX.h"
>-#include "OpenGLShims.h"
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/graphics/GLContext.h b/Source/WebCore/platform/graphics/GLContext.h
>index c9b65999e8ff828f6f7f66db46dd2210aa986e66..d78576a2b6df7158168dc33f5c732aeeede5775c 100644
>--- a/Source/WebCore/platform/graphics/GLContext.h
>+++ b/Source/WebCore/platform/graphics/GLContext.h
>@@ -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)
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
>index 013941102d41b7dbdfbf91661a9768040d5ac590..9fc4d3199036039d48ae7bb2a32a09cff5830666 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
>@@ -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

Flags:

ews-feeder: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 236593: 451941