AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 04:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'for-master' into 'master'

Browse Source 
rendernodeparser: Handle Cairo being stupid

See merge request GNOME/gtk!909
This commit is contained in:
Benjamin Otte 2019-06-03 15:45:20 +00:00
commit 4efa457a63
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gsk/gskrendernodeparser.c
View File

@ -1902,6 +1902,12 @@ cairo_write_array (void *closure,
return CAIRO_STATUS_SUCCESS;
}
static void
cairo_destroy_array (gpointer array)
{
g_byte_array_free (array, TRUE);
}
static void
render_node_print (Printer *p,
GskRenderNode *node)
@ -2394,6 +2400,7 @@ render_node_print (Printer *p,
#ifdef CAIRO_HAS_SCRIPT_SURFACE
if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_RECORDING)
{
static const cairo_user_data_key_t cairo_is_stupid_key;
cairo_device_t *script;
array = g_byte_array_new ();
@ -2407,8 +2414,14 @@ render_node_print (Printer *p,
g_free (b64);
}
cairo_device_destroy (script);
/* because Cairo is stupid and writes to the device after we finished it,
* we can't just
g_byte_array_free (array, TRUE);
* but have to
*/
g_byte_array_set_size (array, 0);
cairo_device_set_user_data (script, &cairo_is_stupid_key, array, cairo_destroy_array);
cairo_device_destroy (script);
}
#endif
}