isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59: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

6
src/tests/clutter/conform/frame-clock-timeline.c
View File

@ -109,7 +109,7 @@ frame_clock_timeline_basic (void)
g_main_loop_unref (main_loop);
g_object_unref (timeline);
g_assert_null (timeline);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
g_assert_null (frame_clock);
}
@ -192,9 +192,9 @@ frame_clock_timeline_switch (void)
g_main_loop_unref (main_loop);
g_object_unref (timeline);
g_assert_null (timeline);
g_object_unref (frame_clock1);
clutter_frame_clock_destroy (frame_clock1);
g_assert_null (frame_clock1);
g_object_unref (frame_clock2);
clutter_frame_clock_destroy (frame_clock2);
g_assert_null (frame_clock2);
}

16
src/tests/clutter/conform/frame-clock.c
View File

@ -166,7 +166,7 @@ frame_clock_schedule_update (void)
g_main_loop_unref (test.main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
g_source_destroy (source);
g_source_unref (source);
}
@ -242,7 +242,7 @@ frame_clock_immediate_present (void)
g_assert_cmpint (after_us - before_us, >, 9 * refresh_interval_us);
g_main_loop_unref (main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
}
static gboolean
@ -323,7 +323,7 @@ frame_clock_delayed_damage (void)
g_assert_cmpint (after_us - before_us, >, 100000 + refresh_interval_us);
g_main_loop_unref (test.main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
g_source_destroy (source);
g_source_unref (source);
}
@ -372,7 +372,7 @@ frame_clock_no_damage (void)
g_main_loop_run (main_loop);
g_main_loop_unref (main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
}
typedef struct _UpdateNowFrameClockTest
@ -472,7 +472,7 @@ frame_clock_schedule_update_now (void)
g_main_loop_unref (test.base.main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
g_source_destroy (source);
g_source_unref (source);
}
@ -543,7 +543,7 @@ frame_clock_before_frame (void)
g_assert_cmpint (expected_frame_count, >, 2);
g_main_loop_unref (main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
}
typedef struct _InhibitTest
@ -625,7 +625,7 @@ frame_clock_inhibit (void)
g_assert_cmpint (test.frame_count, ==, 2);
g_main_loop_unref (test.main_loop);
g_object_unref (test.frame_clock);
clutter_frame_clock_destroy (test.frame_clock);
}
typedef struct _RescheduleOnIdleFrameClockTest
@ -687,7 +687,7 @@ frame_clock_reschedule_on_idle (void)
g_main_loop_run (test.base.main_loop);
g_main_loop_unref (test.base.main_loop);
g_object_unref (frame_clock);
clutter_frame_clock_destroy (frame_clock);
}
CLUTTER_TEST_SUITE (