Changeset 260570 in webkit

Timestamp:

Apr 23, 2020 8:24:02 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Crash in cairo_surface_mark_dirty_rectangle() in accelerated compositing mode under X11
​https://bugs.webkit.org/show_bug.cgi?id=210636

Patch by John Frankish <​john.frankish@outlook.com> on 2020-04-23
Reviewed by Carlos Garcia Campos.

When cairo is configured to use xcb instead of xlib, it might use an image surface attached to the xlib one as
snapshot. In that case a flush is needed to detach that snapshot after we have drawn the surface in the
context.

• UIProcess/gtk/AcceleratedBackingStoreX11.cpp:

(WebKit::AcceleratedBackingStoreX11::paint): Call cairo_surface_flush() after drawing.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-23  John Frankish  <john.frankish@outlook.com>
+
+        [GTK] Crash in cairo_surface_mark_dirty_rectangle() in accelerated compositing mode under X11
+        https://bugs.webkit.org/show_bug.cgi?id=210636
+
+        Reviewed by Carlos Garcia Campos.
+
+        When cairo is configured to use xcb instead of xlib, it might use an image surface attached to the xlib one as
+        snapshot. In that case a flush is needed to detach that snapshot after we have drawn the surface in the
+        context.
+
+        * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+        (WebKit::AcceleratedBackingStoreX11::paint): Call cairo_surface_flush() after drawing.
+
 2020-04-23  Chris Dumez  <cdumez@apple.com>
 

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

@@ -202 +202 @@
     cairo_restore(cr);
 
+    cairo_surface_flush(m_surface.get());
+
     return true;
 }