brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/tests/conform: Fix actor-offscreen-redirect

Browse Source 
The actor-offscreen-redirect didn't initialize its state properly, so
it could potentially end up with the "was_painted" state being TRUE
from the start, effectively skipping the whole test.

Fixing so that the test even run resulted in the test getting stuck in
a dead lock due to the verification that a frame was drawn was done
from a paint callback. A paint callback had the mutex held, so when the
test case tried to run the main loop, the next paint callback caller
path taken would try to re-lock the same mutex, thus dead lock.

https://bugzilla.gnome.org/show_bug.cgi?id=768976
This commit is contained in:
Jonas Ådahl 2016-05-26 22:44:49 +08:00
parent feb4c36659
commit 9c0fa583f5
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
clutter/tests/conform/actor-offscreen-redirect.c
View File

@ -176,6 +176,33 @@ verify_redraw (Data *data, int expected_paint_count)
g_assert_cmpint (data->foo_actor->paint_count, ==, expected_paint_count); g_assert_cmpint (data->foo_actor->paint_count, ==, expected_paint_count);
} }
static gboolean
verify_redraws (gpointer user_data)
{
Data *data = user_data;
/* Queueing a redraw on the actor should cause a redraw */
clutter_actor_queue_redraw (data->container);
verify_redraw (data, 1);
/* Queueing a redraw on a child should cause a redraw */
clutter_actor_queue_redraw (data->child);
verify_redraw (data, 1);
/* Modifying the transformation on the parent should cause a
redraw */
clutter_actor_set_anchor_point (data->parent_container, 0, 1);
verify_redraw (data, 1);
/* Redrawing an unrelated actor shouldn't cause a redraw */
clutter_actor_set_position (data->unrelated_actor, 0, 1);
verify_redraw (data, 0);
data->was_painted = TRUE;
return G_SOURCE_REMOVE;
}
static gboolean static gboolean
run_verify (gpointer user_data) run_verify (gpointer user_data)
{ {
@ -273,24 +300,8 @@ run_verify (gpointer user_data)
0, 0,
255); 255);
/* Queueing a redraw on the actor should cause a redraw */ /* Check redraws */
clutter_actor_queue_redraw (data->container); g_idle_add (verify_redraws, data);
verify_redraw (data, 1);
/* Queueing a redraw on a child should cause a redraw */
clutter_actor_queue_redraw (data->child);
verify_redraw (data, 1);
/* Modifying the transformation on the parent should cause a
redraw */
clutter_actor_set_anchor_point (data->parent_container, 0, 1);
verify_redraw (data, 1);
/* Redrawing an unrelated actor shouldn't cause a redraw */
clutter_actor_set_position (data->unrelated_actor, 0, 1);
verify_redraw (data, 0);
data->was_painted = TRUE;
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -298,7 +309,7 @@ run_verify (gpointer user_data)
static void static void
actor_offscreen_redirect (void) actor_offscreen_redirect (void)
{ {
Data data; Data data = { 0 };
if (!cogl_features_available (COGL_FEATURE_OFFSCREEN)) if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
return; return;