Title: [240855] releases/WebKitGTK/webkit-2.22/Source/WebKit
- Revision
- 240855
- Author
- [email protected]
- Date
- 2019-02-01 09:00:18 -0800 (Fri, 01 Feb 2019)
Log Message
Merge r240723 - [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: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (240854 => 240855)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2019-02-01 17:00:15 UTC (rev 240854)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2019-02-01 17:00:18 UTC (rev 240855)
@@ -1,5 +1,17 @@
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 Carlos Garcia Campos <[email protected]>
+
[GTK] gdk_cairo_draw_from_gl() in AcceleratedBackingStoreWayland fails in GtkInspector's magnifier
https://bugs.webkit.org/show_bug.cgi?id=193903
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (240854 => 240855)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2019-02-01 17:00:15 UTC (rev 240854)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2019-02-01 17:00:18 UTC (rev 240855)
@@ -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
