sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

tests: Use helper to get ClutterBackend

Browse source 
Instead of using the get_default API, which goes through
the Context.get_default that we want to get rid of

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3977>
This commit is contained in:
Bilal Elmoussaoui 2024-08-20 21:51:55 +02:00
parent 1abbfb5ed2
commit c1e9711a83
15 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tests/clutter/conform/actor-event-hold.c
View file

@ -81,7 +81,7 @@ actor_event_hold (void)
clutter_actor_show (stage);
/* Get the input device*/
backend = clutter_get_default_backend ();
backend = clutter_test_get_backend ();
seat = clutter_backend_get_default_seat (backend);
virtual_pointer =

2
src/tests/clutter/conform/actor-offscreen-redirect.c
View file

@ -40,7 +40,7 @@ foo_actor_paint (ClutterActor *actor,
ClutterPaintContext *paint_context)
{
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
FooActor *foo_actor = (FooActor *) actor;
ClutterActorBox allocation;
CoglPipeline *pipeline;

4
src/tests/clutter/conform/binding-pool.c
View file

@ -137,7 +137,7 @@ key_group_paint (ClutterActor *actor,
{
KeyGroup *self = KEY_GROUP (actor);
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
ClutterActorIter iter;
ClutterActor *child;
CoglPipeline *pipeline;
@ -232,7 +232,7 @@ send_keyval (KeyGroup *group, int keyval)
ClutterSeat *seat;
ClutterEvent *event;
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
event = clutter_event_key_new (CLUTTER_KEY_PRESS,
CLUTTER_EVENT_FLAG_SYNTHETIC,
CLUTTER_CURRENT_TIME,

12
src/tests/clutter/conform/event-delivery.c
View file

@ -48,7 +48,7 @@ static void
event_delivery_consecutive_touch_begin_end (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
ClutterSeat *seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
gboolean was_updated;
@ -159,7 +159,7 @@ event_delivery_implicit_grabbing (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *child;
@ -250,7 +250,7 @@ event_delivery_implicit_grab_cancelled (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *child_1, *child_2;
@ -367,7 +367,7 @@ event_delivery_implicit_grab_existing_clutter_grab (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *child_1, *child_2;
@ -538,7 +538,7 @@ event_delivery_stop_discrete_event (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
TestAction *test_action;
@ -595,7 +595,7 @@ event_delivery_actor_stop_sequence_event (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
TestAction *test_action;

12
src/tests/clutter/conform/gesture-relationship.c
View file

@ -104,7 +104,7 @@ gesture_relationship_cancel_on_recognize (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL));
@ -163,7 +163,7 @@ gesture_relationship_simple (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL));
@ -225,7 +225,7 @@ gesture_relationship_two_points (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL));
@ -274,7 +274,7 @@ gesture_relationship_two_points_two_actors (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *second_actor = clutter_actor_new ();
@ -343,7 +343,7 @@ gesture_relationship_claim_new_sequence_while_already_recognizing (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL));
@ -441,7 +441,7 @@ gesture_relationship_claim_new_sequence_while_already_recognizing_2 (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *second_actor = clutter_actor_new ();

10
src/tests/clutter/conform/gesture.c
View file

@ -79,7 +79,7 @@ gesture_disposed_while_active (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *second_actor = clutter_actor_new ();
@ -129,7 +129,7 @@ gesture_state_machine_move_to_waiting (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL));
@ -189,7 +189,7 @@ gesture_state_machine_move_to_cancelled_while_possible (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL));
@ -236,7 +236,7 @@ gesture_state_machine_move_to_cancelled_on_sequence_cancel (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterActor *second_actor = clutter_actor_new ();
@ -296,7 +296,7 @@ gesture_multiple_mouse_buttons (void)
{
ClutterActor *stage = clutter_test_get_stage ();
ClutterSeat *seat =
clutter_backend_get_default_seat (clutter_get_default_backend ());
clutter_backend_get_default_seat (clutter_test_get_backend ());
g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL;
int64_t now_us;
ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL));

4
src/tests/clutter/conform/grab.c
View file

@ -137,7 +137,7 @@ create_pointer (ClutterActor *actor)
ClutterSeat *seat;
guint notify_id;
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
clutter_virtual_input_device_notify_absolute_motion (pointer,
@ -620,7 +620,7 @@ grab_input_only (void)
ClutterSeat *seat;
g_autoptr (ClutterVirtualInputDevice) pointer = NULL;
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE);
test_data_init (&data);

4
src/tests/clutter/conform/text.c
View file

@ -334,7 +334,7 @@ send_keyval (ClutterText *text, int keyval)
ClutterSeat *seat;
/* Unicode should be ignored for cursor keys etc. */
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
event = clutter_event_key_new (CLUTTER_KEY_PRESS,
CLUTTER_EVENT_FLAG_SYNTHETIC,
CLUTTER_CURRENT_TIME,
@ -354,7 +354,7 @@ send_unichar (ClutterText *text, gunichar unichar)
ClutterSeat *seat;
/* Key symbol should be ignored for printable characters */
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
event = clutter_event_key_new (CLUTTER_KEY_PRESS,
CLUTTER_EVENT_FLAG_SYNTHETIC,
CLUTTER_CURRENT_TIME,

2
src/tests/clutter/interactive/test-cogl-multitexture.c
View file

@ -152,7 +152,7 @@ test_cogl_multitexture_main (int argc, char *argv[])
files[2] = g_build_filename (TESTS_DATADIR, "light0.png", NULL);
files[3] = NULL;
ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
ctx = clutter_backend_get_cogl_context (clutter_test_get_backend ());
state->alpha_tex = clutter_test_texture_2d_new_from_file (ctx, files[0], &error);
if (!state->alpha_tex)
g_critical ("Failed to load redhand_alpha.png: %s", error->message);

2
src/tests/clutter/interactive/test-cogl-offscreen.c
View file

@ -238,7 +238,7 @@ test_coglbox_init (TestCoglbox *self)
{
g_autoptr (GError) error = NULL;
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
gchar *file;
printf ("Loading redhand.png\n");

2
src/tests/clutter/interactive/test-cogl-point-sprites.c
View file

@ -222,7 +222,7 @@ test_cogl_point_sprites_main (int argc, char *argv[])
ClutterActor *stage;
CoglTexture *tex;
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
Data data;
GError *error = NULL;
int i;

4
src/tests/clutter/interactive/test-cogl-shader-glsl.c
View file

@ -193,7 +193,7 @@ set_shader_num (int new_no)
CoglProgram *program;
CoglPipeline *shader_pipeline;
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
int image_width = cogl_texture_get_width (redhand);
int image_height = cogl_texture_get_height (redhand);
int uniform_no;
@ -316,7 +316,7 @@ test_cogl_shader_glsl_main (int argc, char *argv[])
CoglColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
CoglPipeline *shader_pipeline;
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
clutter_test_init (&argc, &argv);

2
src/tests/clutter/interactive/test-cogl-tex-tile.c
View file

@ -105,7 +105,7 @@ test_coglbox_init (TestCoglbox *self)
{
g_autoptr (GError) error = NULL;
CoglContext *ctx =
clutter_backend_get_cogl_context (clutter_get_default_backend ());
clutter_backend_get_cogl_context (clutter_test_get_backend ());
gchar *file;
file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);

2
src/tests/clutter/interactive/test-devices.c
View file

@ -185,7 +185,7 @@ test_devices_main (int argc, char **argv)
clutter_actor_show (stage);
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
seat = clutter_backend_get_default_seat (clutter_test_get_backend ());
g_signal_connect (seat,
"device-added", G_CALLBACK (seat_device_added_cb),
app);

2
src/tests/clutter/performance/test-common.h
View file

@ -99,7 +99,7 @@ static gboolean perf_fake_mouse_cb (gpointer stage)
*/
{
ClutterEvent *event;
ClutterBackend *backend = clutter_get_default_backend ();
ClutterBackend *backend = clutter_test_get_backend ();
ClutterSeat *seat = clutter_backend_get_default_seat (backend);
device = clutter_seat_get_pointer (seat);