brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/texture-cache: Move icon theme lookup out of the hot path

Browse Source 
It was showing up on profile traces over at
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1547#note_996417
After this change it no longer does.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1558>
This commit is contained in:
Ivan Molodetskikh 2021-01-05 16:45:55 +03:00
parent e73204b9fa
commit b51be0e389
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/st/st-texture-cache.c
View File

@ -974,7 +974,6 @@ st_texture_cache_load_gicon (StTextureCache *cache,
g_autofree char *key = NULL; g_autofree char *key = NULL;
float actor_size; float actor_size;
GtkIconTheme *theme; GtkIconTheme *theme;
GtkIconInfo *info;
StTextureCachePolicy policy; StTextureCachePolicy policy;
StIconColors *colors = NULL; StIconColors *colors = NULL;
StIconStyle icon_style = ST_ICON_STYLE_REQUESTED; StIconStyle icon_style = ST_ICON_STYLE_REQUESTED;
@ -1014,11 +1013,6 @@ st_texture_cache_load_gicon (StTextureCache *cache,
lookup_flags |= GTK_ICON_LOOKUP_DIR_LTR; lookup_flags |= GTK_ICON_LOOKUP_DIR_LTR;
scale = ceilf (paint_scale * resource_scale); scale = ceilf (paint_scale * resource_scale);
info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon,
size, scale,
lookup_flags);
if (info == NULL)
return NULL;
gicon_string = g_icon_to_string (icon); gicon_string = g_icon_to_string (icon);
/* A return value of NULL indicates that the icon can not be serialized, /* A return value of NULL indicates that the icon can not be serialized,
@ -1046,14 +1040,21 @@ st_texture_cache_load_gicon (StTextureCache *cache,
actor = create_invisible_actor (); actor = create_invisible_actor ();
clutter_actor_set_size (actor, actor_size, actor_size); clutter_actor_set_size (actor, actor_size, actor_size);
if (ensure_request (cache, key, policy, &request, actor)) if (!ensure_request (cache, key, policy, &request, actor))
{
/* If there's an outstanding request, we've just added ourselves to it */
g_object_unref (info);
}
else
{ {
/* Else, make a new request */ /* Else, make a new request */
GtkIconInfo *info;
info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon,
size, scale,
lookup_flags);
if (info == NULL)
{
g_hash_table_remove (cache->priv->outstanding_requests, key);
texture_load_data_free (request);
g_object_unref (actor);
return NULL;
}
request->cache = cache; request->cache = cache;
/* Transfer ownership of key */ /* Transfer ownership of key */