Cherry-pick 301043@main (1d16639f9d57). https://bugs.webkit.org/show_bug.cgi?id=300085

    [GTK][WPE] OpenGL assets created by WebGL are not released when destroying the WebGLRenderingContext
    https://bugs.webkit.org/show_bug.cgi?id=300085

    Reviewed by Carlos Garcia Campos.

    Stop using a singleton for the ANGLE sharing context. Each ANGLE context will use
    its own ANGLE sharing context instead, that will be created and destroyed together
    with the ANGLE context. This ensures that all the OpenGL resources that were created
    by ANGLE will be destroyed when the contexts are destroyed.

    * Source/WebCore/platform/graphics/PlatformDisplay.cpp:
    (WebCore::PlatformDisplay::clearGLContexts):
    * Source/WebCore/platform/graphics/PlatformDisplay.h:
    * Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h:
    * Source/WebCore/platform/graphics/angle/PlatformDisplayANGLE.cpp:
    (WebCore::PlatformDisplay::angleSharingGLContext):
    (WebCore::PlatformDisplay::clearANGLESharingGLContext): Deleted.
    * Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:
    (WebCore::GraphicsContextGLANGLE::~GraphicsContextGLANGLE):
    (WebCore::GraphicsContextGLTextureMapperANGLE::platformInitializeContext):

    Canonical link: https://commits.webkit.org/301043@main

Author: magomez

Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@ -130,9 +130,6 @@ void PlatformDisplay::clearSharingGLContext()
 #endif
 #if ENABLE(VIDEO) && USE(GSTREAMER_GL)
     m_gstGLContext = nullptr;
-#endif
-#if ENABLE(WEBGL) && !PLATFORM(WIN)
-    clearANGLESharingGLContext();
 #endif
     m_sharingGLContext = nullptr;
 }

Source/WebCore/platform/graphics/PlatformDisplay.h

@@ -130,15 +130,10 @@ class PlatformDisplay {
     void invalidateSkiaGLContexts();
 #endif
 
-#if ENABLE(WEBGL) && !PLATFORM(WIN)
-    void clearANGLESharingGLContext();
-#endif
-
     void terminateEGLDisplay();
 
 #if ENABLE(WEBGL) && !PLATFORM(WIN)
     mutable EGLDisplay m_angleEGLDisplay { nullptr };
-    EGLContext m_angleSharingGLContext { nullptr };
 #endif
 
 #if ENABLE(VIDEO) && USE(GSTREAMER_GL)

Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h

@@ -443,6 +443,7 @@ class WEBCORE_EXPORT GraphicsContextGLANGLE : public GraphicsContextGL {
 
     GCGLDisplay m_displayObj { nullptr };
     GCGLContext m_contextObj { nullptr };
+    GCGLContext m_angleSharingContextObj { nullptr };
     GCGLConfig m_configObj { nullptr };
 #if USE(TEXTURE_MAPPER)
     GCEGLSurface m_surfaceObj { nullptr };

Source/WebCore/platform/graphics/angle/PlatformDisplayANGLE.cpp

@@ -84,9 +84,6 @@ EGLContext PlatformDisplay::angleSharingGLContext()
 #if PLATFORM(WIN)
     return sharingGLContext()->platformContext();
 #else
-    if (m_angleSharingGLContext != EGL_NO_CONTEXT)
-        return m_angleSharingGLContext;
-
     ASSERT(m_angleEGLDisplay != EGL_NO_DISPLAY);
     auto sharingContext = sharingGLContext();
     if (!sharingContext)
@@ -115,25 +112,10 @@ EGLContext PlatformDisplay::angleSharingGLContext()
         EGL_EXTERNAL_CONTEXT_ANGLE, EGL_TRUE,
         EGL_NONE
     };
-    m_angleSharingGLContext = EGL_CreateContext(m_angleEGLDisplay, config, EGL_NO_CONTEXT, contextAttributes);
-    return m_angleSharingGLContext;
-#endif
-}
 
-#if ENABLE(WEBGL) && !PLATFORM(WIN)
-void PlatformDisplay::clearANGLESharingGLContext()
-{
-    if (m_angleSharingGLContext == EGL_NO_CONTEXT)
-        return;
-
-    ASSERT(m_angleEGLDisplay);
-    ASSERT(m_sharingGLContext);
-    EGL_MakeCurrent(m_angleEGLDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    EGL_DestroyContext(m_angleEGLDisplay, m_angleSharingGLContext);
-    m_angleSharingGLContext = EGL_NO_CONTEXT;
-}
+    return EGL_CreateContext(m_angleEGLDisplay, config, EGL_NO_CONTEXT, contextAttributes);
 #endif
-
+}
 
 } // namespace WebCore
 

Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp

@@ -108,10 +108,16 @@ GraphicsContextGLANGLE::~GraphicsContextGLANGLE()
     GL_DeleteFramebuffers(1, &m_fbo);
 
     if (m_contextObj) {
-        EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
         EGL_DestroyContext(m_displayObj, m_contextObj);
     }
 
+    if (m_angleSharingContextObj)
+        EGL_DestroyContext(m_displayObj, m_angleSharingContextObj);
+
+    // Ideally this should go before the m_contextObj destruction, but there are platforms where it breaks
+    // the destruction m_contextObj. Putting it here works for all the platforms that I've tested.
+    EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
     if (m_surfaceObj)
         EGL_DestroySurface(m_displayObj, m_surfaceObj);
 }
@@ -306,7 +312,13 @@ bool GraphicsContextGLTextureMapperANGLE::platformInitializeContext()
     }
     eglContextAttributes.append(EGL_NONE);
 
-    m_contextObj = EGL_CreateContext(m_displayObj, m_configObj, sharedDisplay.angleSharingGLContext(), eglContextAttributes.data());
+    m_angleSharingContextObj = sharedDisplay.angleSharingGLContext();
+    if (m_angleSharingContextObj == EGL_NO_CONTEXT) {
+        LOG(WebGL, "ANGLE sharing EGLContext Initialization failed.");
+        return false;
+    }
+
+    m_contextObj = EGL_CreateContext(m_displayObj, m_configObj, m_angleSharingContextObj, eglContextAttributes.data());
     if (m_contextObj == EGL_NO_CONTEXT) {
         LOG(WebGL, "EGLContext Initialization failed.");
         return false;