Changeset 240723 in webkit

Timestamp:

Jan 30, 2019 12:04:14 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][Wayland] REGRESSION(r240712): Clear the GL context if it's the current one on dispose
​https://bugs.webkit.org/show_bug.cgi?id=194024

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-01-30
Reviewed by Michael Catanzaro.

Fixes a crash in gdk_gl_context_dispose().

• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:

(WebKit::AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-30  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][Wayland] REGRESSION(r240712): Clear the GL context if it's the current one on dispose
+        https://bugs.webkit.org/show_bug.cgi?id=194024
+
+        Reviewed by Michael Catanzaro.
+
+        Fixes a crash in gdk_gl_context_dispose().
+
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        (WebKit::AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland):
+
 2019-01-30  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp

@@ -59 +59 @@
 {
     WaylandCompositor::singleton().unregisterWebPage(m_webPage);
+
+#if GTK_CHECK_VERSION(3, 16, 0)
+    if (m_gdkGLContext && m_gdkGLContext.get() == gdk_gl_context_get_current())
+        gdk_gl_context_clear_current();
+#endif
 }