Title: [240723] trunk/Source/WebKit
- Revision
- 240723
- Author
- [email protected]
- Date
- 2019-01-30 12:04:14 -0800 (Wed, 30 Jan 2019)
Log 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 <[email protected]> on 2019-01-30
Reviewed by Michael Catanzaro.
Fixes a crash in gdk_gl_context_dispose().
* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (240722 => 240723)
--- trunk/Source/WebKit/ChangeLog 2019-01-30 19:30:17 UTC (rev 240722)
+++ trunk/Source/WebKit/ChangeLog 2019-01-30 20:04:14 UTC (rev 240723)
@@ -1,3 +1,15 @@
+2019-01-30 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
Crash in WebKit::RemoteLayerTreePropertyApplier::updateChildren
Modified: trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (240722 => 240723)
--- trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2019-01-30 19:30:17 UTC (rev 240722)
+++ trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2019-01-30 20:04:14 UTC (rev 240723)
@@ -58,6 +58,11 @@
AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland()
{
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
}
void AcceleratedBackingStoreWayland::tryEnsureGLContext()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
