isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/actor: Mark implicit transitions as remove-on-complete

Browse Source 
Implicit transitions had a referenced taken while emitting the
completion signals, but said reference would only be released if it was
had remove-on-complete set to TRUE.

Change this to instead remove the 'is_implicit' state and mark all
implicit transitions as remove-on-complete. This fixes a
ClutterPropertyTransition leak in gnome-shell triggered by e.g. showing
/ hiding menus.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1740

https://gitlab.gnome.org/GNOME/mutter/merge_requests/828
This commit is contained in:
Jonas Ådahl 2019-10-04 19:37:06 +02:00
parent 107e521553
commit 6ee006c851
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1031,7 +1031,6 @@ typedef struct _TransitionClosure
ClutterTransition *transition; ClutterTransition *transition;
gchar *name; gchar *name;
gulong completed_id; gulong completed_id;
guint is_implicit : 1;
} TransitionClosure; } TransitionClosure;
static void clutter_container_iface_init (ClutterContainerIface *iface); static void clutter_container_iface_init (ClutterContainerIface *iface);
@ -4239,11 +4238,7 @@ _clutter_actor_stop_transitions (ClutterActor *self)
{ {
TransitionClosure *closure = value; TransitionClosure *closure = value;
/* implicit transitions, and automatically managed explicit ones, if (clutter_transition_get_remove_on_complete (closure->transition))
* should be removed at this point
*/
if (closure->is_implicit ||
clutter_transition_get_remove_on_complete (closure->transition))
{ {
g_hash_table_iter_remove (&iter); g_hash_table_iter_remove (&iter);
} }
@ -19524,12 +19519,12 @@ on_transition_stopped (ClutterTransition *transition,
t_quark = g_quark_from_string (clos->name); t_quark = g_quark_from_string (clos->name);
t_name = g_strdup (clos->name); t_name = g_strdup (clos->name);
if (clos->is_implicit || if (clutter_transition_get_remove_on_complete (transition))
clutter_transition_get_remove_on_complete (transition))
{ {
/* we take a reference here because removing the closure /* we take a reference here because removing the closure will release the
* will release the reference on the transition, and we * reference on the transition, and we want the transition to survive the
* want the transition to survive the signal emission * signal emission. It'll be unreferenced by the remove-on-complete
* handling in ClutterTransition::stopped.
*/ */
g_object_ref (transition); g_object_ref (transition);
@ -19568,8 +19563,7 @@ on_transition_stopped (ClutterTransition *transition,
static void static void
clutter_actor_add_transition_internal (ClutterActor *self, clutter_actor_add_transition_internal (ClutterActor *self,
const gchar *name, const gchar *name,
ClutterTransition *transition, ClutterTransition *transition)
gboolean is_implicit)
{ {
ClutterTimeline *timeline; ClutterTimeline *timeline;
TransitionClosure *clos; TransitionClosure *clos;
@ -19599,7 +19593,6 @@ clutter_actor_add_transition_internal (ClutterActor *self,
clos->actor = self; clos->actor = self;
clos->transition = g_object_ref (transition); clos->transition = g_object_ref (transition);
clos->name = g_strdup (name); clos->name = g_strdup (name);
clos->is_implicit = is_implicit;
clos->completed_id = g_signal_connect (timeline, "stopped", clos->completed_id = g_signal_connect (timeline, "stopped",
G_CALLBACK (on_transition_stopped), G_CALLBACK (on_transition_stopped),
clos); clos);
@ -19758,6 +19751,8 @@ _clutter_actor_create_transition (ClutterActor *actor,
{ {
res = clutter_property_transition_new (pspec->name); res = clutter_property_transition_new (pspec->name);
clutter_transition_set_remove_on_complete (res, TRUE);
interval = clutter_interval_new_with_values (ptype, &initial, &final); interval = clutter_interval_new_with_values (ptype, &initial, &final);
clutter_transition_set_interval (res, interval); clutter_transition_set_interval (res, interval);
@ -19791,7 +19786,7 @@ _clutter_actor_create_transition (ClutterActor *actor,
#endif /* CLUTTER_ENABLE_DEBUG */ #endif /* CLUTTER_ENABLE_DEBUG */
/* this will start the transition as well */ /* this will start the transition as well */
clutter_actor_add_transition_internal (actor, pspec->name, res, TRUE); clutter_actor_add_transition_internal (actor, pspec->name, res);
/* the actor now owns the transition */ /* the actor now owns the transition */
g_object_unref (res); g_object_unref (res);
@ -19865,7 +19860,7 @@ clutter_actor_add_transition (ClutterActor *self,
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL);
g_return_if_fail (CLUTTER_IS_TRANSITION (transition)); g_return_if_fail (CLUTTER_IS_TRANSITION (transition));
clutter_actor_add_transition_internal (self, name, transition, FALSE); clutter_actor_add_transition_internal (self, name, transition);
} }
/** /**