AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-17 07:30:09 +00:00
Code Issues Projects Releases Wiki Activity

cssimagefallback: Avoid allocating GPtrArray for colors

Browse Source 
If we just parse a color, like image(#FFF), avoid allocating the
GPtrArray to store images. This happens in Adwaita for background images
of backdrop buttons. We save around 70 GPtrArrays this way.
This commit is contained in:
Timm Bäder 2020-09-23 06:06:42 +02:00
parent 716b5afe6a
commit 484dcc043b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkcssimagefallback.c
View File

@ -209,6 +209,9 @@ gtk_css_image_fallback_parse_arg (GtkCssParser *parser,
if (image == NULL) if (image == NULL)
return 0; return 0;
if (!data->images)
data->images = g_ptr_array_new_with_free_func (g_object_unref);
g_ptr_array_add (data->images, image); g_ptr_array_add (data->images, image);
return 1; return 1;
} }
@ -235,18 +238,25 @@ gtk_css_image_fallback_parse (GtkCssImage *image,
return FALSE; return FALSE;
} }
data.images = g_ptr_array_new_with_free_func (g_object_unref);
if (!gtk_css_parser_consume_function (parser, 1, G_MAXUINT, gtk_css_image_fallback_parse_arg, &data)) if (!gtk_css_parser_consume_function (parser, 1, G_MAXUINT, gtk_css_image_fallback_parse_arg, &data))
{ {
g_clear_pointer (&data.color, _gtk_css_value_unref); g_clear_pointer (&data.color, _gtk_css_value_unref);
g_ptr_array_free (data.images, TRUE); if (data.images)
g_ptr_array_free (data.images, TRUE);
return FALSE; return FALSE;
} }
self->color = data.color; self->color = data.color;
self->n_images = data.images->len; if (data.images)
self->images = (GtkCssImage **) g_ptr_array_free (data.images, FALSE); {
self->n_images = data.images->len;
self->images = (GtkCssImage **) g_ptr_array_free (data.images, FALSE);
}
else
{
self->n_images = 0;
self->images = NULL;
}
return TRUE; return TRUE;
} }