brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Avoid redundant margin changes

Browse Source 
When profiling gnome-shell it was found that one of the main triggers
of `clutter_actor_queue_relayout` during animations was
`clutter_actor_set_margin_internal` continuously setting the same
zero margins. That's obviously pointless but also expensive since it
incurs full stage relayouts and reallocation. So just avoid redundant
margin changes.

Helps to further improve:
https://gitlab.gnome.org/GNOME/mutter/issues/233,
https://gitlab.gnome.org/GNOME/gnome-shell/issues/349
This commit is contained in:
Daniel van Vugt 2018-09-20 11:47:24 +02:00 committed by Florian Müllner
parent fa495286a1
commit 59acb38951
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter/clutter-actor.c
View File

@ -18434,6 +18434,10 @@ clutter_actor_set_margin_top (ClutterActor *self,
g_return_if_fail (margin >= 0.f); g_return_if_fail (margin >= 0.f);
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
if (info->margin.top == margin)
return;
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_TOP], _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_TOP],
info->margin.top, info->margin.top,
margin); margin);
@ -18478,6 +18482,10 @@ clutter_actor_set_margin_bottom (ClutterActor *self,
g_return_if_fail (margin >= 0.f); g_return_if_fail (margin >= 0.f);
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
if (info->margin.bottom == margin)
return;
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_BOTTOM], _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_BOTTOM],
info->margin.bottom, info->margin.bottom,
margin); margin);
@ -18522,6 +18530,10 @@ clutter_actor_set_margin_left (ClutterActor *self,
g_return_if_fail (margin >= 0.f); g_return_if_fail (margin >= 0.f);
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
if (info->margin.left == margin)
return;
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_LEFT], _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_LEFT],
info->margin.left, info->margin.left,
margin); margin);
@ -18566,6 +18578,10 @@ clutter_actor_set_margin_right (ClutterActor *self,
g_return_if_fail (margin >= 0.f); g_return_if_fail (margin >= 0.f);
info = _clutter_actor_get_layout_info_or_defaults (self); info = _clutter_actor_get_layout_info_or_defaults (self);
if (info->margin.right == margin)
return;
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_RIGHT], _clutter_actor_create_transition (self, obj_props[PROP_MARGIN_RIGHT],
info->margin.right, info->margin.right,
margin); margin);