Mark surface as dirty before flushing it

If we're trying to read back the contents of a GdkWindow that was
created from a foreign windowing system surface, we are going to
forcibly mark it as dirty before flushing the Cairo state.

To avoid regressing any further in the future of the 3.x branch, let's
leave a comment.

Fixes: #5482
This commit is contained in:
Emmanuele Bassi 2023-02-12 19:18:00 +00:00
parent f931c73316
commit fba09dbfc7

View File

@ -102,8 +102,17 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
/* We do not know what happened to this surface outside of GDK.
* Especially for foreign windows, they will have been modified
* by external applications.
*
* So be on the safe side and:
* - mark the surface as dirty, in case the GdkWindow was
* created from a foreign X11 surface
* - flush the Cairo state
*
* For reference, see:
* - https://bugzilla.gnome.org/show_bug.cgi?id=754952
* - https://gitlab.gnome.org/GNOME/gtk/-/issues/4456
*/
cairo_surface_mark_dirty (surface);
cairo_surface_flush (surface);
if (cairo_surface_get_content (surface) & CAIRO_CONTENT_ALPHA)