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

clutter/transition: Don't split reference counting with actor

Browse Source 
ClutterActor took a reference in its transition 'stopped' handler,
aiming to keep the transition alive during signal emission even if it
was removed during. This is, however, already taken care of by
ClutterTimeline, by always taking a reference during its 'stopped'
signal emission, so no need to add another one.

This also has the bonus of making reference ownership simpler, as well
as avoidance of double free if an actor was destroyed before a
transition has finished.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/828
This commit is contained in:
Jonas Ådahl 2019-10-07 18:40:58 +02:00
parent fb6e2743ec
commit 2c388e2155
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19521,13 +19521,6 @@ on_transition_stopped (ClutterTransition *transition,
if (clutter_transition_get_remove_on_complete (transition)) if (clutter_transition_get_remove_on_complete (transition))
{ {
/* we take a reference here because removing the closure will release the
* reference on the transition, and we want the transition to survive the
* signal emission. It'll be unreferenced by the remove-on-complete
* handling in ClutterTransition::stopped.
*/
g_object_ref (transition);
/* this is safe, because the timeline has now stopped, /* this is safe, because the timeline has now stopped,
* so we won't recurse; the reference on the Animatable * so we won't recurse; the reference on the Animatable
* will be dropped by the ::stopped signal closure in * will be dropped by the ::stopped signal closure in

1
clutter/clutter/clutter-transition.c
View File

@ -134,7 +134,6 @@ clutter_transition_stopped (ClutterTimeline *timeline,
clutter_transition_detach (CLUTTER_TRANSITION (timeline), clutter_transition_detach (CLUTTER_TRANSITION (timeline),
priv->animatable); priv->animatable);
g_clear_object (&priv->animatable); g_clear_object (&priv->animatable);
g_object_unref (timeline);
} }
} }