Title: [290364] releases/WebKitGTK/webkit-2.36/Source/WebCore
- Revision
- 290364
- Author
- carlo...@webkit.org
- Date
- 2022-02-23 04:06:05 -0800 (Wed, 23 Feb 2022)
Log Message
Merge r290299 - Properly uninitialize EGL display before termination
https://bugs.webkit.org/show_bug.cgi?id=236766
>From the docs [1], if contexts or surfaces associated with display
is current to any thread, they are not released until they
are no longer current as a result of eglMakeCurrent.
So call eglMakeCurrent() to such effect.
[1] https://www.khronos.org/registry/EGL/sdk/docs/man/html/eglMakeCurrent.xhtml
Reviewed by Carlos Garcia Campos.
* platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::terminateEGLDisplay):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog (290363 => 290364)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog 2022-02-23 11:49:04 UTC (rev 290363)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog 2022-02-23 12:06:05 UTC (rev 290364)
@@ -1,3 +1,21 @@
+2022-02-22 Pablo Saavedra <psaave...@igalia.com>
+
+ Properly uninitialize EGL display before termination
+ https://bugs.webkit.org/show_bug.cgi?id=236766
+
+ From the docs [1], if contexts or surfaces associated with display
+ is current to any thread, they are not released until they
+ are no longer current as a result of eglMakeCurrent.
+
+ So call eglMakeCurrent() to such effect.
+
+ [1] https://www.khronos.org/registry/EGL/sdk/docs/man/html/eglMakeCurrent.xhtml
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/PlatformDisplay.cpp:
+ (WebCore::PlatformDisplay::terminateEGLDisplay):
+
2022-02-21 Alex Christensen <achristen...@webkit.org>
Improve const correctness for SecurityOrigin accessors
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/PlatformDisplay.cpp (290363 => 290364)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2022-02-23 11:49:04 UTC (rev 290363)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2022-02-23 12:06:05 UTC (rev 290364)
@@ -278,6 +278,7 @@
ASSERT(m_eglDisplayInitialized);
if (m_eglDisplay == EGL_NO_DISPLAY)
return;
+ eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglTerminate(m_eglDisplay);
m_eglDisplay = EGL_NO_DISPLAY;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
