[mutter] clutter/timeline: Don't manually set frame clock in set_actor()
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/timeline: Don't manually set frame clock in set_actor()
- Date: Mon, 11 Jan 2021 10:04:20 +0000 (UTC)
commit 7871ab5437e579a424b6c5cee2bd58621914145f
Author: Jonas Dreßler <verdre v0yd nl>
Date: Mon Dec 14 11:18:41 2020 +0100
clutter/timeline: Don't manually set frame clock in set_actor()
In clutter_timeline_set_actor() we currently always unset the
priv->frame_clock pointer of the old actor when a new actor gets set.
The priv->frame_clock pointer takes a reference on the ClutterFrameClock
though, so we leak ClutterFrameClocks here.
To fix it, simply rely on update_frame_clock(), which will call
set_frame_clock_internal() unconditionally to update the
priv->frame_clock pointer for us.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1632>
clutter/clutter/clutter-timeline.c | 5 -----
1 file changed, 5 deletions(-)
---
diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
index 23392fc99d..03b9236454 100644
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -473,11 +473,6 @@ clutter_timeline_set_actor (ClutterTimeline *timeline,
g_clear_signal_handler (&priv->stage_stage_views_handler_id, priv->stage);
priv->stage = NULL;
priv->actor = NULL;
-
- if (priv->is_playing)
- maybe_remove_timeline (timeline);
-
- priv->frame_clock = NULL;
}
priv->actor = actor;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]