Attachment 360587 Details for Bug 194024 – Patch

[patch] Patch

wk2-wl-ac-crash.diff (text/plain), 1.55 KB, created by Carlos Garcia Campos on 2019-01-30 09:30:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-01-30 09:30:36 PST

Size: 1.55 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 014a86e60a0..01c5561b2c8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+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 NOBODY (OOPS!).
>+
>+        Fixes a crash in gdk_gl_context_dispose().
>+
>+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
>+        (WebKit::AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland):
>+
> 2019-01-30  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] gdk_cairo_draw_from_gl() in AcceleratedBackingStoreWayland fails in GtkInspector's magnifier
>diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
>index 1e6dfe6d902..f01bab3b401 100644
>--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
>+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
>@@ -58,6 +58,11 @@ AcceleratedBackingStoreWayland::AcceleratedBackingStoreWayland(WebPageProxy& web
> 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()

Actions: View | Formatted Diff | Diff

Attachments on bug 194024: 360587