isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-01 14:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter/frame-clock: Add explicit destroy function

Browse Source 
The frame clock owner should be able to explicitly destroy (i.e. make
defunct) a frame clock, e.g. when a stage view is destructed. This is so
that other objects can keep reference to its without it being left
around even after stopped being usable.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1285
This commit is contained in:
Jonas Ådahl
2020-06-10 14:43:16 +02:00
parent e12ce70385
commit d29c8e290c
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
clutter/clutter/clutter-frame-clock.c
View File

@@ -24,6 +24,15 @@
#include "clutter/clutter-timeline-private.h"
#include "cogl/cogl-trace.h"
enum
{
DESTROY,
N_SIGNALS
};
static guint signals[N_SIGNALS];
/* Wait 2ms after vblank before starting to draw next frame */
#define SYNC_DELAY_US ms2us (2)
@@ -495,18 +504,26 @@ clutter_frame_clock_new (float refresh_rate,
return frame_clock;
}
static void
clutter_frame_clock_finalize (GObject *object)
void
clutter_frame_clock_destroy (ClutterFrameClock *frame_clock)
{
ClutterFrameClock *frame_clock = CLUTTER_FRAME_CLOCK (object);
g_object_run_dispose (G_OBJECT (frame_clock));
g_object_unref (frame_clock);
}
static void
clutter_frame_clock_dispose (GObject *object)
{
ClutterFrameClock *frame_clock = CLUTTER_FRAME_CLOCK (object);
if (frame_clock->source)
{
g_signal_emit (frame_clock, signals[DESTROY], 0);
g_source_destroy (frame_clock->source);
g_source_unref (frame_clock->source);
g_clear_pointer (&frame_clock->source, g_source_unref);
}
G_OBJECT_CLASS (clutter_frame_clock_parent_class)->finalize (object);
G_OBJECT_CLASS (clutter_frame_clock_parent_class)->dispose (object);
}
static void
@@ -520,5 +537,14 @@ clutter_frame_clock_class_init (ClutterFrameClockClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = clutter_frame_clock_finalize;
object_class->dispose = clutter_frame_clock_dispose;
signals[DESTROY] =
g_signal_new (I_("destroy"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL, NULL,
G_TYPE_NONE,
0);
}

3
clutter/clutter/clutter-frame-clock.h
View File

@@ -56,6 +56,9 @@ ClutterFrameClock * clutter_frame_clock_new (float re
const ClutterFrameListenerIface *iface,
gpointer user_data);
CLUTTER_EXPORT
void clutter_frame_clock_destroy (ClutterFrameClock *frame_clock);
CLUTTER_EXPORT
void clutter_frame_clock_notify_presented (ClutterFrameClock *frame_clock,
ClutterFrameInfo *frame_info);

2
clutter/clutter/clutter-stage-view.c
View File

@@ -1274,7 +1274,7 @@ clutter_stage_view_dispose (GObject *object)
g_clear_pointer (&priv->offscreen, cogl_object_unref);
g_clear_pointer (&priv->offscreen_pipeline, cogl_object_unref);
g_clear_pointer (&priv->redraw_clip, cairo_region_destroy);
g_clear_object (&priv->frame_clock);
g_clear_pointer (&priv->frame_clock, clutter_frame_clock_destroy);
G_OBJECT_CLASS (clutter_stage_view_parent_class)->dispose (object);
}